enhance: block other hotkeys when there is a command palette (#2173）

Signed-off-by: leo <longshuang@msn.cn>

Author: love-linger

src/Views/Launcher.axaml

@@ -127,7 +127,9 @@
     <Border Grid.Row="0" Grid.RowSpan="2"
             Background="Transparent"
             IsVisible="{Binding CommandPalette, Converter={x:Static ObjectConverters.IsNotNull}}"
-            PointerPressed="OnCloseCommandPalette">
+            PointerPressed="OnCloseCommandPalette"
+            KeyDown="OnCommandPaletteKeyDown"
+            KeyUp="OnCommandPaletteKeyUp">
       <Border Width="420" HorizontalAlignment="Center" VerticalAlignment="Center" Effect="drop-shadow(0 0 12 #A0000000)">
         <Border Background="{DynamicResource Brush.Popup}" CornerRadius="8">
           <ContentControl Margin="16,10,16,12" Content="{Binding CommandPalette}">

src/Views/Launcher.axaml.cs

@@ -131,6 +131,11 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
 
                 ViewModels.Preferences.Instance.Layout.LauncherWindowState = state;
             }
+            else if (change.Property == IsActiveProperty)
+            {
+                if (!IsActive && DataContext is ViewModels.Launcher { CommandPalette: { } } vm)
+                    vm.CommandPalette = null;
+            }
         }
 
         protected override void OnSizeChanged(SizeChangedEventArgs e)
@@ -203,6 +208,13 @@ protected override async void OnKeyDown(KeyEventArgs e)
                     return;
                 }
 
+                if (e.Key == Key.T)
+                {
+                    vm.AddNewTab();
+                    e.Handled = true;
+                    return;
+                }
+
                 if ((OperatingSystem.IsMacOS() && e.KeyModifiers.HasFlag(KeyModifiers.Alt) && e.Key == Key.Right) ||
                     (!OperatingSystem.IsMacOS() && !e.KeyModifiers.HasFlag(KeyModifiers.Shift) && e.Key == Key.Tab))
                 {
@@ -265,11 +277,7 @@ protected override async void OnKeyDown(KeyEventArgs e)
             }
             else if (e.Key == Key.Escape)
             {
-                if (vm.CommandPalette != null)
-                    vm.CommandPalette = null;
-                else
-                    vm.ActivePage.CancelPopup();
-
+                vm.ActivePage.CancelPopup();
                 e.Handled = true;
                 return;
             }
@@ -317,6 +325,9 @@ private void OnOpenWorkspaceMenu(object sender, RoutedEventArgs e)
         {
             if (sender is Button btn && DataContext is ViewModels.Launcher launcher)
             {
+                if (launcher.CommandPalette != null)
+                    launcher.CommandPalette = null;
+
                 var pref = ViewModels.Preferences.Instance;
                 var menu = new ContextMenu();
                 menu.Placement = PlacementMode.BottomEdgeAlignedLeft;
@@ -384,6 +395,23 @@ private void OnCloseCommandPalette(object sender, PointerPressedEventArgs e)
             e.Handled = true;
         }
 
+        private void OnCommandPaletteKeyDown(object sender, KeyEventArgs e)
+        {
+            if (DataContext is ViewModels.Launcher { CommandPalette: { } } vm)
+            {
+                if (e.Key == Key.Escape)
+                    vm.CommandPalette = null;
+
+                e.Route = RoutingStrategies.Direct;
+                e.Handled = true;
+            }
+        }
+
+        private void OnCommandPaletteKeyUp(object sender, KeyEventArgs e)
+        {
+            e.Handled = true;
+        }
+
         private WindowState _lastWindowState = WindowState.Normal;
     }
 }

src/Views/LauncherTabBar.axaml

@@ -153,7 +153,7 @@
         <Path Width="8" Height="14" Stretch="Fill" Data="{StaticResource Icons.TriangleRight}"/>
       </RepeatButton>
 
-      <Button Classes="icon_button" Width="16" Height="28" Margin="4,2,0,0" Command="{Binding AddNewTab}" HotKey="{OnPlatform Ctrl+T, macOS=⌘+T}">
+      <Button Classes="icon_button" Width="16" Height="28" Margin="4,2,0,0" Command="{Binding AddNewTab}">
         <ToolTip.Tip>
           <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
             <TextBlock Text="{DynamicResource Text.PageTabBar.New}" VerticalAlignment="Center"/>

src/Views/RepositoryToolbar.axaml.cs

@@ -163,6 +163,9 @@ private async void Fetch(object sender, TappedEventArgs e)
 
         private async void FetchDirectlyByHotKey(object sender, RoutedEventArgs e)
         {
+            if (App.GetLauncher() is { CommandPalette: { } } launcher)
+                return;
+
             if (DataContext is ViewModels.Repository repo)
             {
                 await repo.FetchAsync(true);
@@ -181,6 +184,9 @@ private async void Pull(object sender, TappedEventArgs e)
 
         private async void PullDirectlyByHotKey(object sender, RoutedEventArgs e)
         {
+            if (App.GetLauncher() is { CommandPalette: { } } launcher)
+                return;
+
             if (DataContext is ViewModels.Repository repo)
             {
                 await repo.PullAsync(true);
@@ -199,6 +205,9 @@ private async void Push(object sender, TappedEventArgs e)
 
         private async void PushDirectlyByHotKey(object sender, RoutedEventArgs e)
         {
+            if (App.GetLauncher() is { CommandPalette: { } } launcher)
+                return;
+
             if (DataContext is ViewModels.Repository repo)
             {
                 await repo.PushAsync(true);

src/Views/WorkingCopy.axaml.cs

@@ -231,6 +231,9 @@ private async void OnContinue(object _, RoutedEventArgs e)
 
         private async void OnCommit(object _, RoutedEventArgs e)
         {
+            if (App.GetLauncher() is { CommandPalette: { } } launcher)
+                return;
+
             if (DataContext is ViewModels.WorkingCopy vm)
                 await vm.CommitAsync(false, false);
 
@@ -239,6 +242,9 @@ private async void OnCommit(object _, RoutedEventArgs e)
 
         private async void OnCommitWithAutoStage(object _, RoutedEventArgs e)
         {
+            if (App.GetLauncher() is { CommandPalette: { } } launcher)
+                return;
+
             if (DataContext is ViewModels.WorkingCopy vm)
                 await vm.CommitAsync(true, false);
 
@@ -247,6 +253,9 @@ private async void OnCommitWithAutoStage(object _, RoutedEventArgs e)
 
         private async void OnCommitWithPush(object _, RoutedEventArgs e)
         {
+            if (App.GetLauncher() is { CommandPalette: { } } launcher)
+                return;
+
             if (DataContext is ViewModels.WorkingCopy vm)
                 await vm.CommitAsync(false, true);