Cleanup

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

Hide file tree

Showing 3 changed files with 33 additions and 58 deletions.
diff --git a/EverythingToolbar/Controls/SearchBox.xaml.cs b/EverythingToolbar/Controls/SearchBox.xaml.cs
@@ -56,25 +56,15 @@ private void OnPreviewKeyDown(object sender, KeyEventArgs e)
                 return;
             }
             else if (Keyboard.Modifiers == ModifierKeys.None &&
-                (e.Key == Key.Down || e.Key == Key.Enter))
+                (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))
             {
                 EventDispatcher.Instance.InvokeSearchResultsListViewKeyEvent(this, e);
                 e.Handled = true;
                 return;
             }
-
-            if (Settings.Default.isAutoSelectFirstResult)
-            {
-                // The search bar should not lose focus in this mode, so some key events
-                // need to be forwarded to the SearchResultsListView
-                if (e.Key == Key.Home || e.Key == Key.End ||
-                    e.Key == Key.PageDown || e.Key == Key.PageUp ||
-                    e.Key == Key.Up)
-                {
-                    EventDispatcher.Instance.InvokeSearchResultsListViewKeyEvent(this, e);
-                    e.Handled = true;
-                }
-            }
         }
 
         private void UpdateSearchTerm(string newSearchTerm)

diff --git a/EverythingToolbar/Controls/SearchResultsView.xaml.cs b/EverythingToolbar/Controls/SearchResultsView.xaml.cs
@@ -100,48 +100,48 @@ private void OnKeyPressed(object sender, KeyEventArgs e)
             {
                 SelectedItem?.CopyPathToClipboard();
             }
-            else if (Keyboard.Modifiers == (ModifierKeys.Control) && e.Key == Key.C)
+            else if (Keyboard.Modifiers == ModifierKeys.Control && e.Key == Key.C)
             {
                 SelectedItem?.CopyToClipboard();
             }
-            else if (e.Key == Key.Up && !Settings.Default.isAutoSelectFirstResult)
+            else if (e.Key == Key.Up)
             {
-                if (SearchResultsListView.SelectedIndex == 0)
+                if (SearchResultsListView.SelectedIndex == 0 && !Settings.Default.isAutoSelectFirstResult)
                 {
                     SearchResultsListView.SelectedIndex = -1;
                     EventDispatcher.Instance.InvokeSearchBoxFocused(this, EventArgs.Empty);
-                    e.Handled = true;
                 }
-            }
-
-            // The following key bindings are only required when forwarding events from the search box
-            // and should not be executed when the ListView is already focused since it handles them itself.
-            if (IsKeyboardFocusWithin)
-                return;
+                else
+                {
+                    SelectPreviousSearchResult();
+                }
 
-            if (e.Key == Key.Up)
-            {
-                SelectPreviousSearchResult();
+                e.Handled = true;
             }
             else if (e.Key == Key.Down)
             {
                 SelectNextSearchResult();
+                e.Handled = true;
             }
             else if (e.Key == Key.PageUp)
             {
                 PageUp();
+                e.Handled = true;
             }
             else if (e.Key == Key.PageDown)
             {
                 PageDown();
+                e.Handled = true;
             }
             else if (e.Key == Key.Home)
             {
                 SelectFirstSearchResult();
+                e.Handled = true;
             }
             else if (e.Key == Key.End)
             {
                 SelectLastSearchResult();
+                e.Handled = true;
             }
         }
 
@@ -176,39 +176,34 @@ private void ScrollToVerticalOffset(double verticalOffset)
 
         private void SelectNextSearchResult()
         {
-            if (SearchResultsListView.SelectedIndex >= SearchResultsListView.Items.Count - 1)
-                return;
-
-            SearchResultsListView.SelectedIndex++;
-            SearchResultsListView.ScrollIntoView(SearchResultsListView.SelectedItem);
-            FocusSelectedItem();
+            SelectNthSearchResult(SearchResultsListView.SelectedIndex + 1);
         }
 
         private void SelectPreviousSearchResult()
         {
-            if (SearchResultsListView.SelectedIndex <= 0)
-                return;
-
-            SearchResultsListView.SelectedIndex--;
-            SearchResultsListView.ScrollIntoView(SelectedItem);
-            FocusSelectedItem();
+            SelectNthSearchResult(SearchResultsListView.SelectedIndex - 1);
         }
 
         public void SelectFirstSearchResult()
         {
-            if (SearchResultsListView.Items.IsEmpty)
-                return;
-
-            SearchResultsListView.SelectedIndex = 0;
-            SearchResultsListView.ScrollIntoView(SelectedItem);
-            FocusSelectedItem();
+            SelectNthSearchResult(0);
         }
 
         private void SelectLastSearchResult()
         {
-            SearchResultsListView.SelectedIndex = SearchResultsListView.Items.Count - 1;
+            SelectNthSearchResult(SearchResultsListView.Items.Count - 1);
+        }
+
+        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()
@@ -406,15 +401,5 @@ 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/SearchWindow.xaml.cs b/EverythingToolbar/SearchWindow.xaml.cs
@@ -52,7 +52,7 @@ private SearchWindow()
                     Instance.Hide();
                     Keyboard.ClearFocus();
                 }
-                else if (e.Key == Key.Tab)  // TODO: not registered
+                else if (e.Key == Key.Tab)
                 {
                     var offset = Keyboard.Modifiers.HasFlag(ModifierKeys.Shift) ? -1 : 1;
                     EverythingSearch.Instance.CycleFilters(offset);