Skip to content

Make the switch profile editor keyboard and screen-reader accessible #475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
enaboapps merged 1 commit into from
Jul 28, 2026
Merged

Make the switch profile editor keyboard and screen-reader accessible #475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
135 changes: 120 additions & 15 deletions src/SwitchifyPc.App/SwitchControlProfileWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
Background="{DynamicResource ChromeBackground}"
Foreground="{DynamicResource Text}"
WindowStyle="None"
SizeChanged="Window_SizeChanged">
SizeChanged="Window_SizeChanged"
PreviewKeyDown="Window_PreviewKeyDown">
<shell:WindowChrome.WindowChrome>
<shell:WindowChrome CaptionHeight="44"
CornerRadius="0"
Expand All @@ -25,6 +26,8 @@
</shell:WindowChrome.WindowChrome>

<Window.Resources>
<BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />

<Style TargetType="Button">
<Setter Property="MinHeight" Value="38" />
<Setter Property="Padding" Value="14,0" />
Expand Down Expand Up @@ -53,6 +56,12 @@
<Setter TargetName="Root" Property="BorderBrush" Value="{DynamicResource BrandPrimary}" />
<Setter TargetName="Root" Property="Background" Value="{DynamicResource SurfaceMuted}" />
</Trigger>
<Trigger Property="IsKeyboardFocused" Value="True">
<Setter TargetName="Root"
Property="BorderBrush"
Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
<Setter TargetName="Root" Property="BorderThickness" Value="2" />
</Trigger>
<Trigger Property="IsEnabled" Value="False">
<Setter TargetName="Root" Property="Opacity" Value="0.55" />
</Trigger>
Expand Down Expand Up @@ -90,6 +99,12 @@
<Setter TargetName="Root" Property="Background" Value="{DynamicResource BrandPrimaryHover}" />
<Setter TargetName="Root" Property="BorderBrush" Value="{DynamicResource BrandPrimaryHover}" />
</Trigger>
<Trigger Property="IsKeyboardFocused" Value="True">
<Setter TargetName="Root"
Property="BorderBrush"
Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
<Setter TargetName="Root" Property="BorderThickness" Value="2" />
</Trigger>
<Trigger Property="IsEnabled" Value="False">
<Setter TargetName="Root" Property="Opacity" Value="0.55" />
</Trigger>
Expand Down Expand Up @@ -136,7 +151,12 @@
<Setter Property="CaretBrush" Value="{DynamicResource Text}" />
<Style.Triggers>
<Trigger Property="IsKeyboardFocusWithin" Value="True">
<Setter Property="BorderBrush" Value="{DynamicResource BrandPrimary}" />
<Setter Property="BorderBrush"
Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
<Setter Property="BorderThickness" Value="2" />
</Trigger>
<Trigger Property="IsReadOnly" Value="True">
<Setter Property="Background" Value="{DynamicResource SurfaceMuted}" />
</Trigger>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="Background" Value="{DynamicResource SurfaceMuted}" />
Expand Down Expand Up @@ -241,7 +261,10 @@
<Trigger Property="IsKeyboardFocusWithin" Value="True">
<Setter TargetName="DropDownToggle"
Property="BorderBrush"
Value="{DynamicResource BrandPrimary}" />
Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
<Setter TargetName="DropDownToggle"
Property="BorderThickness"
Value="2" />
</Trigger>
<Trigger Property="IsEnabled" Value="False">
<Setter TargetName="DropDownToggle"
Expand Down Expand Up @@ -286,6 +309,13 @@
Value="{DynamicResource SegmentSelectedBackground}" />
<Setter Property="Foreground" Value="{DynamicResource BrandPrimary}" />
</Trigger>
<Trigger Property="IsKeyboardFocused" Value="True">
<Setter TargetName="ItemBorder"
Property="Background"
Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
<Setter Property="Foreground"
Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
Expand Down Expand Up @@ -325,6 +355,12 @@
<Setter Property="Foreground" Value="{DynamicResource BrandPrimary}" />
<Setter Property="FontWeight" Value="Bold" />
</Trigger>
<Trigger Property="IsKeyboardFocused" Value="True">
<Setter TargetName="Root"
Property="BorderBrush"
Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
<Setter TargetName="Root" Property="BorderThickness" Value="2" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
Expand Down Expand Up @@ -398,8 +434,47 @@
<ListBox x:Name="ProfilesList"
Grid.Row="1"
SelectionChanged="ProfilesList_SelectionChanged"
AutomationProperties.Name="Switch control profiles"
DisplayMemberPath="Name" />
AutomationProperties.Name="Switch control profiles">
<ListBox.ItemTemplate>
<DataTemplate>
<Grid AutomationProperties.Name="{Binding AccessibleName}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBlock VerticalAlignment="Center"
Text="{Binding Name}"
TextTrimming="CharacterEllipsis" />
<StackPanel Grid.Column="1"
Margin="8,0,0,0"
Orientation="Horizontal">
<Border Margin="0,0,4,0"
Padding="6,2"
Background="{DynamicResource SurfaceMuted}"
CornerRadius="8"
AutomationProperties.Name="Built-in profile"
Visibility="{Binding IsBuiltIn, Converter={StaticResource BooleanToVisibilityConverter}}">
<TextBlock Text="Built-in"
FontSize="10"
FontWeight="SemiBold" />
</Border>
<Border Padding="6,2"
Background="{DynamicResource AccentContainer}"
BorderBrush="{DynamicResource BrandPrimary}"
BorderThickness="1"
CornerRadius="8"
AutomationProperties.Name="Active profile"
Visibility="{Binding IsActive, Converter={StaticResource BooleanToVisibilityConverter}}">
<TextBlock Text="Active"
FontSize="10"
FontWeight="SemiBold"
Foreground="{DynamicResource OnAccentContainer}" />
</Border>
</StackPanel>
</Grid>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
</Grid>
</Border>

Expand Down Expand Up @@ -454,7 +529,7 @@
DisplayMemberPath="Label"
SelectedValuePath="Value"
SelectedValue="{Binding SelectedType, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
IsEnabled="{Binding IsEditable}"
Visibility="{Binding IsEditable, Converter={StaticResource BooleanToVisibilityConverter}}"
AutomationProperties.Name="{Binding TypeAutomationName}" />
<ComboBox x:Name="BindingValueInput"
Grid.Column="2"
Expand All @@ -464,9 +539,24 @@
Text="{Binding ValueDisplay, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
IsEditable="True"
IsTextSearchEnabled="True"
IsEnabled="{Binding IsEditable}"
Visibility="{Binding IsEditable, Converter={StaticResource BooleanToVisibilityConverter}}"
AutomationProperties.Name="{Binding ValueAutomationName}"
AutomationProperties.HelpText="{Binding ValueHelp}" />
<TextBox Grid.Column="1"
Margin="0,0,10,0"
Text="{Binding SelectedTypeLabel, Mode=OneWay}"
IsReadOnly="True"
IsTabStop="True"
Visibility="{Binding IsReadOnly, Converter={StaticResource BooleanToVisibilityConverter}}"
AutomationProperties.Name="{Binding TypeAutomationName}"
AutomationProperties.HelpText="Read-only action type" />
<TextBox Grid.Column="2"
Text="{Binding ReadOnlyValueDisplay, Mode=OneWay}"
IsReadOnly="True"
IsTabStop="True"
Visibility="{Binding IsReadOnly, Converter={StaticResource BooleanToVisibilityConverter}}"
AutomationProperties.Name="{Binding ValueAutomationName}"
AutomationProperties.HelpText="{Binding ValueHelp}" />
<TextBlock Grid.Row="1"
Grid.Column="1"
Grid.ColumnSpan="2"
Expand Down Expand Up @@ -510,25 +600,40 @@
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal">
<Button Content="New" MinWidth="84" Click="New_Click" />
<Button Margin="8,0,0,0" Content="Duplicate" MinWidth="84" Click="Duplicate_Click" />
<Button Content="_New"
MinWidth="84"
Click="New_Click"
AutomationProperties.Name="New profile"
AutomationProperties.HelpText="Alt+N" />
<Button Margin="8,0,0,0"
Content="D_uplicate"
MinWidth="84"
Click="Duplicate_Click"
AutomationProperties.Name="Duplicate profile"
AutomationProperties.HelpText="Alt+U" />
<Button x:Name="DeleteButton"
Margin="8,0,0,0"
Content="Delete"
Content="_Delete"
MinWidth="84"
Click="Delete_Click" />
Click="Delete_Click"
AutomationProperties.Name="Delete profile"
AutomationProperties.HelpText="Alt+D" />
</StackPanel>
<StackPanel Grid.Column="1" Orientation="Horizontal">
<Button x:Name="CancelButton"
Content="Cancel changes"
Content="_Cancel changes"
MinWidth="110"
Click="Cancel_Click" />
Click="Cancel_Click"
AutomationProperties.Name="Cancel changes"
AutomationProperties.HelpText="Alt+C" />
<Button x:Name="SaveButton"
Margin="8,0,0,0"
Content="Save"
Content="_Save"
MinWidth="84"
Style="{StaticResource PrimaryButton}"
Click="Save_Click" />
Click="Save_Click"
AutomationProperties.Name="Save profile"
AutomationProperties.HelpText="Ctrl+S or Alt+S" />
</StackPanel>
</Grid>
</Grid>
Expand Down
Loading