Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-03 09:46:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Dock: Fix tab focus order for items (#45837)

Browse Source 
Now, once the dock has focus, tab will work the way you'd expect.

* re #45584
* re #45595 - if we do add that KB shortcut, well, reasonable tab focus
would be expected.
This commit is contained in:
Mike Griese
2026-03-01 06:15:41 -06:00
committed by GitHub
parent 543399b62b
commit 7dfe6c0159
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml
View File

@@ -29,7 +29,10 @@
</ItemsPanelTemplate> </ItemsPanelTemplate>
<DataTemplate x:Key="DockBandTemplate" x:DataType="dockVm:DockBandViewModel"> <DataTemplate x:Key="DockBandTemplate" x:DataType="dockVm:DockBandViewModel">
<ItemsRepeater ItemsSource="{x:Bind Items, Mode=OneWay}" Layout="{StaticResource ItemsOrientationLayout}"> <ItemsRepeater
ItemsSource="{x:Bind Items, Mode=OneWay}"
Layout="{StaticResource ItemsOrientationLayout}"
TabFocusNavigation="Local">
<ItemsRepeater.Transitions> <ItemsRepeater.Transitions>
<TransitionCollection /> <TransitionCollection />
</ItemsRepeater.Transitions> </ItemsRepeater.Transitions>
@@ -63,10 +66,12 @@
<Setter Property="Padding" Value="0" /> <Setter Property="Padding" Value="0" />
<Setter Property="IsItemClickEnabled" Value="False" /> <Setter Property="IsItemClickEnabled" Value="False" />
<Setter Property="SelectionMode" Value="None" /> <Setter Property="SelectionMode" Value="None" />
<Setter Property="IsTabStop" Value="False" />
<!-- Drag properties controlled by code-behind based on IsEditMode --> <!-- Drag properties controlled by code-behind based on IsEditMode -->
<Setter Property="CanDragItems" Value="False" /> <Setter Property="CanDragItems" Value="False" />
<Setter Property="CanReorderItems" Value="False" /> <Setter Property="CanReorderItems" Value="False" />
<Setter Property="AllowDrop" Value="False" /> <Setter Property="AllowDrop" Value="False" />
<Setter Property="TabFocusNavigation" Value="Local" />
</Style> </Style>
<Style x:Key="DockBandListViewItemStyle" TargetType="ListViewItem"> <Style x:Key="DockBandListViewItemStyle" TargetType="ListViewItem">
@@ -76,6 +81,7 @@
<Setter Property="MinWidth" Value="0" /> <Setter Property="MinWidth" Value="0" />
<Setter Property="HorizontalContentAlignment" Value="Stretch" /> <Setter Property="HorizontalContentAlignment" Value="Stretch" />
<Setter Property="VerticalContentAlignment" Value="Stretch" /> <Setter Property="VerticalContentAlignment" Value="Stretch" />
<Setter Property="IsTabStop" Value="False" />
</Style> </Style>
<Style <Style
@@ -225,7 +231,8 @@
ItemsPanel="{StaticResource HorizontalItemsPanel}" ItemsPanel="{StaticResource HorizontalItemsPanel}"
ItemsSource="{x:Bind ViewModel.StartItems, Mode=OneWay}" ItemsSource="{x:Bind ViewModel.StartItems, Mode=OneWay}"
SelectionMode="None" SelectionMode="None"
Style="{StaticResource DockBandListViewStyle}" /> Style="{StaticResource DockBandListViewStyle}"
TabIndex="0" />
</cpcontrols:ScrollContainer.Source> </cpcontrols:ScrollContainer.Source>
</cpcontrols:ScrollContainer> </cpcontrols:ScrollContainer>
@@ -260,7 +267,8 @@
ItemsPanel="{StaticResource HorizontalItemsPanel}" ItemsPanel="{StaticResource HorizontalItemsPanel}"
ItemsSource="{x:Bind ViewModel.CenterItems, Mode=OneWay}" ItemsSource="{x:Bind ViewModel.CenterItems, Mode=OneWay}"
SelectionMode="None" SelectionMode="None"
Style="{StaticResource DockBandListViewStyle}" /> Style="{StaticResource DockBandListViewStyle}"
TabIndex="1" />
</cpcontrols:ScrollContainer.Source> </cpcontrols:ScrollContainer.Source>
</cpcontrols:ScrollContainer> </cpcontrols:ScrollContainer>
@@ -294,7 +302,8 @@
ItemsPanel="{StaticResource HorizontalItemsPanel}" ItemsPanel="{StaticResource HorizontalItemsPanel}"
ItemsSource="{x:Bind ViewModel.EndItems, Mode=OneWay}" ItemsSource="{x:Bind ViewModel.EndItems, Mode=OneWay}"
SelectionMode="None" SelectionMode="None"
Style="{StaticResource DockBandListViewStyle}"> Style="{StaticResource DockBandListViewStyle}"
TabIndex="2">
<ListView.ItemContainerTransitions> <ListView.ItemContainerTransitions>
<TransitionCollection /> <TransitionCollection />
</ListView.ItemContainerTransitions> </ListView.ItemContainerTransitions>

3
src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockItemControl.xaml
View File

@@ -54,6 +54,9 @@
<Setter Property="BorderThickness" Value="{ThemeResource ButtonBorderThemeThickness}" /> <Setter Property="BorderThickness" Value="{ThemeResource ButtonBorderThemeThickness}" />
<Setter Property="CornerRadius" Value="{StaticResource DockItemCornerRadius}" /> <Setter Property="CornerRadius" Value="{StaticResource DockItemCornerRadius}" />
<Setter Property="TextVisibility" Value="Visible" /> <Setter Property="TextVisibility" Value="Visible" />
<Setter Property="IsTabStop" Value="True" />
<Setter Property="UseSystemFocusVisuals" Value="True" />
<Setter Property="FocusVisualMargin" Value="-2" />
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="local:DockItemControl"> <ControlTemplate TargetType="local:DockItemControl">