Code Quality: Fixed keyboard shortcuts when refocusing window

Author: yaira2

src/Files.App/UserControls/TabBar/TabBar.xaml

@@ -145,7 +145,7 @@
 								x:Name="SplitPaneMenuItem"
 								x:Load="{x:Bind Commands.SplitPaneHorizontally.IsExecutable, Mode=OneWay}"
 								Text="{helpers:ResourceString Name=SplitPane}">
-								<MenuFlyoutSubItem.Items>									
+								<MenuFlyoutSubItem.Items>
 									<!--  Vertical  -->
 									<uc:MenuFlyoutItemWithThemedIcon
 										x:Name="AddVerticalPaneTabActionButton"
@@ -261,7 +261,8 @@
 						HorizontalAlignment="Stretch"
 						VerticalAlignment="Stretch"
 						Fill="Transparent"
-						Loaded="DragAreaRectangle_Loaded" />
+						Loaded="DragAreaRectangle_Loaded"
+						PointerReleased="DragAreaRectangle_PointerReleased" />
 
 				</Grid>
 			</TabView.TabStripFooter>

src/Files.App/UserControls/TabBar/TabBar.xaml.cs

@@ -19,6 +19,7 @@ public sealed partial class TabBar : BaseTabBar, INotifyPropertyChanged
 		private readonly ICommandManager Commands = Ioc.Default.GetRequiredService<ICommandManager>();
 		private readonly IAppearanceSettingsService AppearanceSettingsService = Ioc.Default.GetRequiredService<IAppearanceSettingsService>();
 		private readonly IWindowContext WindowContext = Ioc.Default.GetRequiredService<IWindowContext>();
+		private readonly IContentPageContext ContentPageContext = Ioc.Default.GetRequiredService<IContentPageContext>();
 
 		// Fields
 
@@ -372,5 +373,12 @@ private async void DragAreaRectangle_Loaded(object sender, RoutedEventArgs e)
 				HorizontalTabView.ActualWidth - TabBarAddNewTabButton.Width - titleBarInset,
 				HorizontalTabView.ActualHeight));
 		}
+
+		private void DragAreaRectangle_PointerReleased(object sender, PointerRoutedEventArgs e)
+		{
+			// Workaround for issue where clicking the drag area prevents keyboard
+			// shortcuts from working, see https://github.com/microsoft/microsoft-ui-xaml/issues/6467
+			DispatcherQueue.TryEnqueue(() => ContentPageContext.ShellPage!.PaneHolder.FocusActivePane());
+		}
 	}
 }

src/Files.App/UserControls/Toolbar.xaml

@@ -60,7 +60,8 @@
 		BackgroundSizing="InnerBorderEdge"
 		BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
 		BorderThickness="1"
-		CornerRadius="8">
+		CornerRadius="8"
+		PointerReleased="RootGrid_PointerReleased">
 		<Grid.ColumnDefinitions>
 			<ColumnDefinition Width="*" />
 			<ColumnDefinition Width="Auto" />

src/Files.App/UserControls/Toolbar.xaml.cs

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

src/Files.App/Views/MainPage.xaml.cs

@@ -162,7 +162,6 @@ public async void MultitaskingControl_CurrentInstanceChanged(object? sender, Cur
 			// Focus the content of the selected tab item (this also avoids an issue where the Omnibar sometimes steals the focus)
 			await Task.Delay(100);
 			ContentPageContext.ShellPage!.PaneHolder.FocusActivePane();
-
 		}
 
 		private void PaneHolder_PropertyChanged(object? sender, PropertyChangedEventArgs e)