Skip to content

Commit 900c312

Browse files
Merge pull request #1575 from onesounds/FixHotkeyFocus
Fix Focus hotkey box when change tab
2 parents 553e5f2 + 16a9d1a commit 900c312

File tree

1 file changed

+3
-22
lines changed

1 file changed

+3
-22
lines changed

Flow.Launcher/SettingWindow.xaml

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,6 @@
427427
<Grid
428428
x:Name="templateRoot"
429429
ClipToBounds="true"
430-
KeyboardNavigation.TabNavigation="Local"
431430
SnapsToDevicePixels="true">
432431
<Grid.ColumnDefinitions>
433432
<ColumnDefinition
@@ -444,31 +443,13 @@
444443
Margin="2,2,2,0"
445444
Panel.ZIndex="1"
446445
Background="Transparent"
447-
IsItemsHost="true"
448-
KeyboardNavigation.TabIndex="1"
446+
IsItemsHost="true"
449447
LastChildFill="False" />
450448
<Border
451-
x:Name="contentPanel"
452-
Grid.Row="0"
453-
Grid.Column="1"
454-
Background="{TemplateBinding Background}"
455-
BorderBrush="{TemplateBinding BorderBrush}"
456-
BorderThickness="{TemplateBinding BorderThickness}"
457-
KeyboardNavigation.DirectionalNavigation="Contained"
458-
KeyboardNavigation.TabIndex="2"
459-
KeyboardNavigation.TabNavigation="Local">
460-
<ContentPresenter
461-
x:Name="PART_SelectedContentHost"
462-
Margin="{TemplateBinding Padding}"
463-
ContentSource="SelectedContent"
464-
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
449+
Grid.Column="1">
450+
<ContentPresenter Grid.Column="1" ContentSource="SelectedContent" />
465451
</Border>
466452
</Grid>
467-
<ControlTemplate.Triggers>
468-
<Trigger Property="IsEnabled" Value="false">
469-
<Setter TargetName="templateRoot" Property="TextElement.Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
470-
</Trigger>
471-
</ControlTemplate.Triggers>
472453
</ControlTemplate>
473454
</Setter.Value>
474455
</Setter>

0 commit comments

Comments
 (0)