Fix keybindings

srwi · Nov 5, 2023 · 66ab20d · 66ab20d
1 parent 246b030
commit 66ab20d
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 40 deletions.
diff --git a/EverythingToolbar/Controls/SearchBox.xaml.cs b/EverythingToolbar/Controls/SearchBox.xaml.cs
@@ -55,13 +55,13 @@ private void OnPreviewKeyDown(object sender, KeyEventArgs e)
                 e.Handled = true;
                 return;
             }
-            else if (Keyboard.Modifiers == ModifierKeys.None &&
-                (e.Key == Key.Down || e.Key == Key.Enter ||
-                 e.Key == Key.Home || e.Key == Key.End ||
-                 e.Key == Key.PageDown || e.Key == Key.PageUp ||
-                 e.Key == Key.Up || e.Key == Key.Down))
+            else if (e.Key == Key.Home || e.Key == Key.End || 
+                e.Key == Key.PageDown || e.Key == Key.PageUp ||
+                e.Key == Key.Up || e.Key == Key.Down ||
+                e.Key == Key.Escape|| e.Key == Key.Enter ||
+                (e.Key >= Key.D0 && e.Key <= Key.D9))
             {
-                EventDispatcher.Instance.InvokeSearchResultsListViewKeyEvent(this, e);
+                EventDispatcher.Instance.InvokeGlobalKeyEvent(this, e);
                 e.Handled = true;
                 return;
             }

diff --git a/EverythingToolbar/Controls/SearchResultsView.xaml.cs b/EverythingToolbar/Controls/SearchResultsView.xaml.cs
@@ -27,7 +27,7 @@ public SearchResultsView()
             SearchResultsListView.ItemsSource = EverythingSearch.Instance.SearchResults;
             ((INotifyCollectionChanged)SearchResultsListView.Items).CollectionChanged += AutoSelectFirstResult;
 
-            EventDispatcher.Instance.SearchResultsListViewKeyEvent += OnKeyPressed;
+            EventDispatcher.Instance.GlobalKeyEvent += OnKeyPressed;
             SearchResultsListView.PreviewKeyDown += OnKeyPressed;
 
             // Mouse events and context menu must be added to the ItemContainerStyle each time it gets updated
@@ -73,12 +73,9 @@ private void OnKeyPressed(object sender, KeyEventArgs e)
             {
                 PreviewSelectedFile();
             }
-            else if (e.Key == Key.Enter)
+            else if (Keyboard.Modifiers == (ModifierKeys.Control | ModifierKeys.Shift) && e.Key == Key.Enter)
             {
-                if (SearchResultsListView.SelectedIndex >= 0)
-                    OpenSelectedSearchResult();
-                else
-                    SelectNextSearchResult();
+                RunAsAdmin(this, null);
             }
             else if (Keyboard.Modifiers == ModifierKeys.Shift && e.Key == Key.Enter)
             {
@@ -92,9 +89,12 @@ private void OnKeyPressed(object sender, KeyEventArgs e)
             {
                 OpenFilePath(this, null);
             }
-            else if (Keyboard.Modifiers == (ModifierKeys.Control | ModifierKeys.Shift) && e.Key == Key.Enter)
+            else if (e.Key == Key.Enter)
             {
-                RunAsAdmin(this, null);
+                if (SearchResultsListView.SelectedIndex >= 0)
+                    OpenSelectedSearchResult();
+                else
+                    SelectNextSearchResult();
             }
             else if (Keyboard.Modifiers == (ModifierKeys.Control | ModifierKeys.Shift) && e.Key == Key.C)
             {
@@ -199,11 +199,9 @@ private void SelectNthSearchResult(int n)
             if (n < 0 || n >= SearchResultsListView.Items.Count)
                 return;
 
-            if (!Settings.Default.isAutoSelectFirstResult)
-                SearchResultsListView.Focus();
-
             SearchResultsListView.SelectedIndex = n;
             SearchResultsListView.ScrollIntoView(SelectedItem);
+            FocusSelectedItem();
         }
 
         private int GetPageSize()
@@ -401,5 +399,15 @@ private void OnContextMenuOpened(object sender, RoutedEventArgs e)
 
             mi.Visibility = isExecutable ? Visibility.Visible : Visibility.Collapsed;
         }
+
+        private void FocusSelectedItem()
+        {
+            if (Settings.Default.isAutoSelectFirstResult)
+                return;
+
+            var selectedItem = (ListViewItem)SearchResultsListView.ItemContainerGenerator.ContainerFromItem(SelectedItem);
+            if (selectedItem != null)
+                Keyboard.Focus(selectedItem);
+        }
     }
 }
diff --git a/EverythingToolbar/Helpers/EventDispatcher.cs b/EverythingToolbar/Helpers/EventDispatcher.cs
@@ -25,10 +25,10 @@ public void InvokeSearchBoxFocused(object sender, EventArgs e)
             SearchBoxFocusRequested?.Invoke(sender, e);
         }
 
-        public event EventHandler<KeyEventArgs> SearchResultsListViewKeyEvent;
-        public void InvokeSearchResultsListViewKeyEvent(object sender, KeyEventArgs e)
+        public event EventHandler<KeyEventArgs> GlobalKeyEvent;
+        public void InvokeGlobalKeyEvent(object sender, KeyEventArgs e)
         {
-            SearchResultsListViewKeyEvent?.Invoke(sender, e);
+            GlobalKeyEvent?.Invoke(sender, e);
         }
 
         public event EventHandler<string> SearchTermReplaced;

diff --git a/EverythingToolbar/SearchWindow.xaml.cs b/EverythingToolbar/SearchWindow.xaml.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Windows;
 using System.Windows.Input;
-using System.Windows.Interop;
 using System.Windows.Media.Animation;
 using System.Windows.Shell;
 using EverythingToolbar.Helpers;
@@ -40,25 +39,8 @@ private SearchWindow()
                 };
             }
 
-            PreviewKeyDown += (s, e) =>
-            {
-                if (e.Key >= Key.D0 && e.Key <= Key.D9 && Keyboard.Modifiers == ModifierKeys.Control)
-                {
-                    int index = e.Key == Key.D0 ? 9 : e.Key - Key.D1;
-                    EverythingSearch.Instance.SelectFilterFromIndex(index);
-                }
-                else if (e.Key == Key.Escape)
-                {
-                    Instance.Hide();
-                    Keyboard.ClearFocus();
-                }
-                else if (e.Key == Key.Tab)
-                {
-                    var offset = Keyboard.Modifiers.HasFlag(ModifierKeys.Shift) ? -1 : 1;
-                    EverythingSearch.Instance.CycleFilters(offset);
-                    e.Handled = true;
-                }
-            };
+            EventDispatcher.Instance.GlobalKeyEvent += OnPreviewKeyDown;
+            PreviewKeyDown += OnPreviewKeyDown;
         }
 
         private void OnLoaded(object sender, RoutedEventArgs e)
@@ -77,6 +59,26 @@ private void OnActivated(object sender, EventArgs e)
             EventDispatcher.Instance.InvokeFocusRequested(this, EventArgs.Empty);
         }
 
+        private void OnPreviewKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key >= Key.D0 && e.Key <= Key.D9 && Keyboard.Modifiers == ModifierKeys.Control)
+            {
+                int index = e.Key == Key.D0 ? 9 : e.Key - Key.D1;
+                EverythingSearch.Instance.SelectFilterFromIndex(index);
+            }
+            else if (e.Key == Key.Escape)
+            {
+                Instance.Hide();
+                Keyboard.ClearFocus();
+            }
+            else if (e.Key == Key.Tab)
+            {
+                var offset = Keyboard.Modifiers.HasFlag(ModifierKeys.Shift) ? -1 : 1;
+                EverythingSearch.Instance.CycleFilters(offset);
+                e.Handled = true;
+            }
+        }
+
         private void OnLostKeyboardFocus(object sender, KeyboardFocusChangedEventArgs e)
         {
             if (e.NewFocus == null)  // New focus outside application