Code Quality: Prevent mode button from removing Omnibar focus

src/Files.App.Controls/Omnibar/Omnibar.Events.cs

@@ -26,12 +26,13 @@ private void AutoSuggestBox_GettingFocus(UIElement sender, GettingFocusEventArgs
 
 		private void AutoSuggestBox_LosingFocus(UIElement sender, LosingFocusEventArgs args)
 		{
-			if (args.NewFocusedElement is Button && IsModeButtonPressed)
-			{
-				IsModeButtonPressed = false;
-				args.TryCancel();
+			// Prevent the TextBox from losing focus when the ModeButton is focused
+			if (args.NewFocusedElement is not Button button ||
+				args.InputDevice is FocusInputDeviceKind.Keyboard ||
+				button.Tag?.ToString() != "ModeButton")
 				return;
-			}
+
+			args.TryCancel();
 		}
 
 		private void AutoSuggestBox_GotFocus(object sender, RoutedEventArgs e)

src/Files.App.Controls/Omnibar/Omnibar.cs

@@ -33,9 +33,6 @@ public partial class Omnibar : Control
 
 		private WeakReference<UIElement?> _previouslyFocusedElement = new(null);
 
-		// NOTE: This is a workaround to keep Omnibar's focus on a mode button being clicked
-		internal bool IsModeButtonPressed { get; set; }
-
 		// Events
 
 		public event TypedEventHandler<Omnibar, OmnibarQuerySubmittedEventArgs>? QuerySubmitted;

src/Files.App.Controls/Omnibar/Omnibar.xaml

@@ -129,11 +129,13 @@
 						<Button
 							x:Name="PART_ModeButton"
 							Width="{StaticResource OmnibarModeDefaultClickAreaWidth}"
+							Height="{StaticResource OmnibarModeDefaultHeight}"
 							Margin="1"
 							Background="{TemplateBinding Background}"
 							BorderBrush="{TemplateBinding BorderBrush}"
 							BorderThickness="0"
 							CornerRadius="{TemplateBinding CornerRadius}"
+							Tag="ModeButton"
 							ToolTipService.ToolTip="{Binding ModeName, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
 							<Button.Resources>
 								<SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{ThemeResource SubtleFillColorSecondary}" />

src/Files.App.Controls/Omnibar/OmnibarMode.Events.cs

@@ -49,7 +49,6 @@ private void ModeButton_Click(object sender, RoutedEventArgs e)
 			if (_ownerRef is null || _ownerRef.TryGetTarget(out var owner) is false || owner.CurrentSelectedMode == this)
 				return;
 
-			owner.IsModeButtonPressed = true;
 			owner.CurrentSelectedMode = this;
 		}
 	}