Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-08 20:27:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FZ Editor] Accessibility fixes (#11097)

Browse Source 
* Added tabindex to editor windows

* Hide icons

* Keyboard accesibile dialog

Co-authored-by: Niels Laute <niels9001@hotmail.com>
This commit is contained in:
Niels Laute
2021-05-04 15:36:03 +02:00
committed by GitHub
parent d586814308
commit 4ef667dc83
4 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/modules/fancyzones/editor/FancyZonesEditor/CanvasEditorWindow.xaml
View File

@@ -12,7 +12,7 @@
BorderThickness="0" BorderThickness="0"
xmlns:ui="http://schemas.modernwpf.com/2019" xmlns:ui="http://schemas.modernwpf.com/2019"
ui:WindowHelper.UseModernWindowStyle="True" ui:WindowHelper.UseModernWindowStyle="True"
ui:TitleBar.IsIconVisible="True" ui:TitleBar.IsIconVisible="False"
SizeToContent="Height" SizeToContent="Height"
Background="{DynamicResource PrimaryBackgroundBrush}" Background="{DynamicResource PrimaryBackgroundBrush}"
ResizeMode="NoResize" ResizeMode="NoResize"
@@ -45,6 +45,7 @@
FontFamily="Segoe MDL2 Assets" FontFamily="Segoe MDL2 Assets"
Content="&#xE109;" Content="&#xE109;"
FontSize="24" FontSize="24"
TabIndex="0"
ToolTip="{x:Static props:Resources.Add_zone}" ToolTip="{x:Static props:Resources.Add_zone}"
DataContext="{Binding Path=Model, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" DataContext="{Binding Path=Model, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"
IsEnabled="{Binding IsZoneAddingAllowed}" IsEnabled="{Binding IsZoneAddingAllowed}"
@@ -60,9 +61,11 @@
Style="{StaticResource DefaultButtonStyle}" Style="{StaticResource DefaultButtonStyle}"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
Grid.Column="2" Grid.Column="2"
TabIndex="2"
Click="OnCancel" /> Click="OnCancel" />
<Button Content="{x:Static props:Resources.Save_Apply}" <Button Content="{x:Static props:Resources.Save_Apply}"
Style="{StaticResource AccentButtonStyle}" Style="{StaticResource AccentButtonStyle}"
TabIndex="1"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
Click="OnSaveApplyTemplate" /> Click="OnSaveApplyTemplate" />
</Grid> </Grid>

4
src/modules/fancyzones/editor/FancyZonesEditor/GridEditorWindow.xaml
View File

@@ -12,7 +12,7 @@
BorderThickness="0" BorderThickness="0"
xmlns:ui="http://schemas.modernwpf.com/2019" xmlns:ui="http://schemas.modernwpf.com/2019"
ui:WindowHelper.UseModernWindowStyle="True" ui:WindowHelper.UseModernWindowStyle="True"
ui:TitleBar.IsIconVisible="True" ui:TitleBar.IsIconVisible="False"
SizeToContent="Height" SizeToContent="Height"
Background="{DynamicResource PrimaryBackgroundBrush}" Background="{DynamicResource PrimaryBackgroundBrush}"
ResizeMode="NoResize" ResizeMode="NoResize"
@@ -61,10 +61,12 @@
<Button Content="{x:Static props:Resources.Cancel}" <Button Content="{x:Static props:Resources.Cancel}"
Style="{StaticResource DefaultButtonStyle}" Style="{StaticResource DefaultButtonStyle}"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
TabIndex="1"
Grid.Column="2" Grid.Column="2"
Click="OnCancel" /> Click="OnCancel" />
<Button Content="{x:Static props:Resources.Save_Apply}" <Button Content="{x:Static props:Resources.Save_Apply}"
Style="{StaticResource AccentButtonStyle}" Style="{StaticResource AccentButtonStyle}"
TabIndex="0"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
Click="OnSaveApplyTemplate" /> Click="OnSaveApplyTemplate" />
</Grid> </Grid>

5
src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml
View File

@@ -158,7 +158,8 @@
Visibility="{Binding Path=Type, Converter={StaticResource LayoutModelTypeBlankToVisibilityConverter}}" Visibility="{Binding Path=Type, Converter={StaticResource LayoutModelTypeBlankToVisibilityConverter}}"
Foreground="{Binding (TextElement.Foreground), RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ContentPresenter}}}" Foreground="{Binding (TextElement.Foreground), RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ContentPresenter}}}"
ToolTip="{x:Static props:Resources.Edit}" ToolTip="{x:Static props:Resources.Edit}"
AutomationProperties.Name="{x:Static props:Resources.Edit}" AutomationProperties.HelpText="{x:Static props:Resources.Edit}"
AutomationProperties.Name="{Binding Name}"
Style="{StaticResource AccentButtonStyle}" Style="{StaticResource AccentButtonStyle}"
ui:ControlHelper.CornerRadius="36" /> ui:ControlHelper.CornerRadius="36" />
</Grid> </Grid>
@@ -422,6 +423,7 @@
AutomationProperties.HelpText="{x:Static props:Resources.QuickKey_Description}" AutomationProperties.HelpText="{x:Static props:Resources.QuickKey_Description}"
AutomationProperties.Name="{x:Static props:Resources.QuickKey_Title}" AutomationProperties.Name="{x:Static props:Resources.QuickKey_Title}"
ItemsSource="{Binding QuickKeysAvailable}" ItemsSource="{Binding QuickKeysAvailable}"
KeyDown="ComboBox_KeyDown"
SelectedItem="{Binding QuickKey}" /> SelectedItem="{Binding QuickKey}" />
</StackPanel> </StackPanel>
@@ -472,6 +474,7 @@
KeyDown="EditDialogNumberBox_KeyDown" KeyDown="EditDialogNumberBox_KeyDown"
Margin="12,0,0,0" Margin="12,0,0,0"
Header="{x:Static props:Resources.Number_of_zones}" Header="{x:Static props:Resources.Number_of_zones}"
AutomationProperties.Name="{x:Static props:Resources.Number_of_zones}"
SpinButtonPlacementMode="Compact" SpinButtonPlacementMode="Compact"
Text="{Binding TemplateZoneCount}" /> Text="{Binding TemplateZoneCount}" />
</StackPanel> </StackPanel>

13
src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml.cs
View File

@@ -423,5 +423,18 @@ namespace FancyZonesEditor
{ {
monitorViewModel.SelectCommand.Execute(e.ClickedItem as MonitorInfoModel); monitorViewModel.SelectCommand.Execute(e.ClickedItem as MonitorInfoModel);
} }
private void ComboBox_KeyDown(object sender, KeyEventArgs e)
{
if (e.Key == Key.Enter || e.Key == Key.Space)
{
e.Handled = true;
ComboBox selectedComboBox = sender as ComboBox;
if (!selectedComboBox.IsDropDownOpen)
{
selectedComboBox.IsDropDownOpen = true;
}
}
}
} }
} }