Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 19:57:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Settings] Fix tabbing issues on KBM settings page (#6304)

Browse Source 
* Removed listview items from tab ordering

* Removed tabstops on key/shortcut item controls to prevent double tab requirement
This commit is contained in:
Arjun Balgovind
2020-09-04 12:42:41 -07:00
committed by GitHub
parent 19771b171c
commit 726f94e2a2
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/core/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml
View File

@@ -14,12 +14,16 @@
<Page.Resources> <Page.Resources>
<local:VisibleIfNotEmpty x:Key="visibleIfNotEmptyConverter" /> <local:VisibleIfNotEmpty x:Key="visibleIfNotEmptyConverter" />
<Style TargetType="ListViewItem" x:Name="KeysListViewContainerStyle">
<Setter Property="IsTabStop" Value="False"/>
</Style>
<DataTemplate x:Name="KeysListViewTemplate" x:DataType="Lib:KeysDataModel"> <DataTemplate x:Name="KeysListViewTemplate" x:DataType="Lib:KeysDataModel">
<StackPanel <StackPanel
Orientation="Horizontal" Orientation="Horizontal"
Height="56"> Height="56">
<ItemsControl <ItemsControl
ItemsSource="{x:Bind GetOriginalKeys()}"> ItemsSource="{x:Bind GetOriginalKeys()}"
IsTabStop="False">
<ItemsControl.ItemsPanel> <ItemsControl.ItemsPanel>
<ItemsPanelTemplate> <ItemsPanelTemplate>
<StackPanel Orientation="Horizontal"/> <StackPanel Orientation="Horizontal"/>
@@ -52,7 +56,8 @@
Margin="5,0,5,0"/> Margin="5,0,5,0"/>
<ItemsControl <ItemsControl
ItemsSource="{x:Bind GetNewRemapKeys()}" ItemsSource="{x:Bind GetNewRemapKeys()}"
Grid.Column="2"> Grid.Column="2"
IsTabStop="False">
<ItemsControl.ItemsPanel> <ItemsControl.ItemsPanel>
<ItemsPanelTemplate> <ItemsPanelTemplate>
<StackPanel Orientation="Horizontal"/> <StackPanel Orientation="Horizontal"/>
@@ -86,7 +91,8 @@
Orientation="Horizontal" Orientation="Horizontal"
Height="56"> Height="56">
<ItemsControl <ItemsControl
ItemsSource="{x:Bind GetOriginalKeys()}"> ItemsSource="{x:Bind GetOriginalKeys()}"
IsTabStop="False">
<ItemsControl.ItemsPanel> <ItemsControl.ItemsPanel>
<ItemsPanelTemplate> <ItemsPanelTemplate>
<StackPanel Orientation="Horizontal"/> <StackPanel Orientation="Horizontal"/>
@@ -119,7 +125,8 @@
Margin="5,0,5,0"/> Margin="5,0,5,0"/>
<ItemsControl <ItemsControl
ItemsSource="{x:Bind GetNewRemapKeys()}" ItemsSource="{x:Bind GetNewRemapKeys()}"
Grid.Column="2"> Grid.Column="2"
IsTabStop="False">
<ItemsControl.ItemsPanel> <ItemsControl.ItemsPanel>
<ItemsPanelTemplate> <ItemsPanelTemplate>
<StackPanel Orientation="Horizontal"/> <StackPanel Orientation="Horizontal"/>
@@ -252,6 +259,7 @@
IsSwipeEnabled="False" IsSwipeEnabled="False"
Visibility="{x:Bind Path=ViewModel.RemapKeys, Mode=OneWay, Converter={StaticResource visibleIfNotEmptyConverter}}" Visibility="{x:Bind Path=ViewModel.RemapKeys, Mode=OneWay, Converter={StaticResource visibleIfNotEmptyConverter}}"
IsEnabled="{x:Bind Path=ViewModel.Enabled, Mode=OneWay}" IsEnabled="{x:Bind Path=ViewModel.Enabled, Mode=OneWay}"
ItemContainerStyle="{StaticResource KeysListViewContainerStyle}"
/> />
<!--<AppBarButton x:Uid="KeyboardManager_RemapKeyboardButton" <!--<AppBarButton x:Uid="KeyboardManager_RemapKeyboardButton"
@@ -297,6 +305,7 @@
ScrollViewer.HorizontalScrollMode="Enabled" ScrollViewer.HorizontalScrollMode="Enabled"
ScrollViewer.HorizontalScrollBarVisibility="Visible" ScrollViewer.HorizontalScrollBarVisibility="Visible"
ScrollViewer.IsHorizontalRailEnabled="True" ScrollViewer.IsHorizontalRailEnabled="True"
ItemContainerStyle="{StaticResource KeysListViewContainerStyle}"
/> />
<!--<AppBarButton x:Uid="KeyboardManager_RemapShortcutsButton" <!--<AppBarButton x:Uid="KeyboardManager_RemapShortcutsButton"