Commit 453151c

committed

Code Quality: Fixed keyboard shortcuts when refocusing window

1 parent 23eec92 commit 453151cCopy full SHA for 453151c

File tree

+21

-4

lines changed

+21

-4

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@`
`145`	`145`	`x:Name="SplitPaneMenuItem"`
`146`	`146`	`x:Load="{x:Bind Commands.SplitPaneHorizontally.IsExecutable, Mode=OneWay}"`
`147`	`147`	`Text="{helpers:ResourceString Name=SplitPane}">`
`148`		`- <MenuFlyoutSubItem.Items>`
	`148`	`+ <MenuFlyoutSubItem.Items>`
`149`	`149`	`<!-- Vertical -->`
`150`	`150`	`<uc:MenuFlyoutItemWithThemedIcon`
`151`	`151`	`x:Name="AddVerticalPaneTabActionButton"`
`@@ -261,7 +261,8 @@`
`261`	`261`	`HorizontalAlignment="Stretch"`
`262`	`262`	`VerticalAlignment="Stretch"`
`263`	`263`	`Fill="Transparent"`
`264`		`- Loaded="DragAreaRectangle_Loaded" />`
	`264`	`+ Loaded="DragAreaRectangle_Loaded"`
	`265`	`+ PointerReleased="DragAreaRectangle_PointerReleased" />`
`265`	`266`
`266`	`267`	`</Grid>`
`267`	`268`	`</TabView.TabStripFooter>`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ public sealed partial class TabBar : BaseTabBar, INotifyPropertyChanged`
`19`	`19`	`private readonly ICommandManager Commands = Ioc.Default.GetRequiredService<ICommandManager>();`
`20`	`20`	`private readonly IAppearanceSettingsService AppearanceSettingsService = Ioc.Default.GetRequiredService<IAppearanceSettingsService>();`
`21`	`21`	`private readonly IWindowContext WindowContext = Ioc.Default.GetRequiredService<IWindowContext>();`
	`22`	`+ private readonly IContentPageContext ContentPageContext = Ioc.Default.GetRequiredService<IContentPageContext>();`
`22`	`23`
`23`	`24`	`// Fields`
`24`	`25`
`@@ -372,5 +373,12 @@ private async void DragAreaRectangle_Loaded(object sender, RoutedEventArgs e)`
`372`	`373`	`HorizontalTabView.ActualWidth - TabBarAddNewTabButton.Width - titleBarInset,`
`373`	`374`	`HorizontalTabView.ActualHeight));`
`374`	`375`	`}`
	`376`	`+`
	`377`	`+ private void DragAreaRectangle_PointerReleased(object sender, PointerRoutedEventArgs e)`
	`378`	`+ {`
	`379`	`+ // Workaround for issue where clicking the drag area prevents keyboard`
	`380`	`+ // shortcuts from working, see https://github.com/microsoft/microsoft-ui-xaml/issues/6467`
	`381`	`+ DispatcherQueue.TryEnqueue(() => ContentPageContext.ShellPage!.PaneHolder.FocusActivePane());`
	`382`	`+ }`
`375`	`383`	`}`
`376`	`384`	`}`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,8 @@`
`60`	`60`	`BackgroundSizing="InnerBorderEdge"`
`61`	`61`	`BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"`
`62`	`62`	`BorderThickness="1"`
`63`		`- CornerRadius="8">`
	`63`	`+ CornerRadius="8"`
	`64`	`+ PointerReleased="RootGrid_PointerReleased">`
`64`	`65`	`<Grid.ColumnDefinitions>`
`65`	`66`	`<ColumnDefinition Width="*" />`
`66`	`67`	`<ColumnDefinition Width="Auto" />`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ public sealed partial class Toolbar : UserControl`
`17`	`17`	`private readonly ICommandManager Commands = Ioc.Default.GetRequiredService<ICommandManager>();`
`18`	`18`	`private readonly IModifiableCommandManager ModifiableCommands = Ioc.Default.GetRequiredService<IModifiableCommandManager>();`
`19`	`19`	`private readonly IAddItemService addItemService = Ioc.Default.GetRequiredService<IAddItemService>();`
	`20`	`+ private readonly IContentPageContext ContentPageContext = Ioc.Default.GetRequiredService<IContentPageContext>();`
`20`	`21`
`21`	`22`	`[GeneratedDependencyProperty]`
`22`	`23`	`public partial NavigationToolbarViewModel? ViewModel { get; set; }`
`@@ -108,5 +109,12 @@ private void AppBarButton_AccessKeyInvoked(UIElement sender, AccessKeyInvokedEve`
`108`	`109`	`if (VisualTreeHelper.GetOpenPopupsForXamlRoot(MainWindow.Instance.Content.XamlRoot).Any())`
`109`	`110`	`args.Handled = true;`
`110`	`111`	`}`
	`112`	`+`
	`113`	`+ private void RootGrid_PointerReleased(object sender, PointerRoutedEventArgs e)`
	`114`	`+ {`
	`115`	`+ // Workaround for issue where clicking the toolbar prevents keyboard`
	`116`	`+ // shortcuts from working, see https://github.com/microsoft/microsoft-ui-xaml/issues/6467`
	`117`	`+ DispatcherQueue.TryEnqueue(() => ContentPageContext.ShellPage!.PaneHolder.FocusActivePane());`
	`118`	`+ }`
`111`	`119`	`}`
`112`	`120`	`}`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,6 @@ public async void MultitaskingControl_CurrentInstanceChanged(object? sender, Cur`
`162`	`162`	`// Focus the content of the selected tab item (this also avoids an issue where the Omnibar sometimes steals the focus)`
`163`	`163`	`await Task.Delay(100);`
`164`	`164`	`ContentPageContext.ShellPage!.PaneHolder.FocusActivePane();`
`165`		`-`
`166`	`165`	`}`
`167`	`166`
`168`	`167`	`private void PaneHolder_PropertyChanged(object? sender, PropertyChangedEventArgs e)`

Comments

(0)