Restore menu keyboard navigation

MainWindow.xaml.cs

@@ -107,6 +107,12 @@ public partial class MainWindow : Window
         var duplicateMenuItem = new System.Windows.Controls.MenuItem { Header = "Duplicate Item" };
         duplicateMenuItem.Click += DuplicateItem_Click;
 
+        var sortMenuItem = new System.Windows.Controls.MenuItem
+        {
+            Header = item.Type == LauncherItemType.Menu ? "Sort This Menu" : "Sort This Level"
+        };
+        sortMenuItem.Click += SortSelected_Click;
+
         var treeItem = new TreeViewItem
         {
             Header = $"{GetTreeStatusPrefix(item)}{item.Title} ({item.Type})",
@@ -117,6 +123,7 @@ public partial class MainWindow : Window
         treeItem.ContextMenu.Items.Add(disableMenuItem);
         treeItem.ContextMenu.Items.Add(openContainingFolderMenuItem);
         treeItem.ContextMenu.Items.Add(duplicateMenuItem);
+        treeItem.ContextMenu.Items.Add(sortMenuItem);
         treeItem.PreviewMouseRightButtonDown += (_, e) =>
         {
             treeItem.IsSelected = true;
@@ -1046,6 +1053,46 @@ public partial class MainWindow : Window
         RefreshView(selectedItem);
     }
 
+    private void SortSelected_Click(object sender, RoutedEventArgs e)
+    {
+        if (controller is null || selectedItem is null)
+        {
+            return;
+        }
+
+        ApplyCurrentItem();
+        LauncherItem itemToSelect = selectedItem;
+        if (selectedItem.Type == LauncherItemType.Menu)
+        {
+            SortItems(selectedItem.Children);
+            RefreshView(itemToSelect);
+            StatusText.Text = $"Sorted {itemToSelect.Title}. Click Save to keep it.";
+            return;
+        }
+
+        List<LauncherItem>? siblings = FindSiblings(controller.Config.Items, selectedItem);
+        if (siblings is null)
+        {
+            return;
+        }
+
+        SortItems(siblings);
+        RefreshView(itemToSelect);
+        StatusText.Text = $"Sorted this level. Click Save to keep it.";
+    }
+
+    private static void SortItems(List<LauncherItem> items)
+    {
+        List<LauncherItem> sortedItems = items
+            .OrderByDescending(item => item.IsFavorite)
+            .ThenBy(item => item.Title, StringComparer.CurrentCultureIgnoreCase)
+            .ThenBy(item => item.Type)
+            .ToList();
+
+        items.Clear();
+        items.AddRange(sortedItems);
+    }
+
     private static bool RemoveItem(List<LauncherItem> items, LauncherItem item)
     {
         if (items.Remove(item))

README.md

@@ -12,7 +12,8 @@ Download the compiled Windows release from:
 
 - System tray launcher
 - Global hotkey, default `Ctrl+Alt+Space`
-- Search/filter in the launcher popup
+- Search/filter in the launcher popup with parent menu context
+- Keyboard navigation in the launcher popup
 - Recent items section for quickly relaunching entries
 - Nested menus, drag/drop ordering, and drag/drop item creation in Settings
 - Right-click launcher entries to edit them in Settings
@@ -21,6 +22,7 @@ Download the compiled Windows release from:
 - Right-click app/file entries to open their containing folder
 - Validate missing app, file, and folder targets from Settings
 - Export and import selected items or menu sections
+- Sort a selected menu or item level alphabetically
 - Right-click item duplication in Settings
 - Right-click items in Settings to pin them to the top of their menu
 - Per-item icon and display mode

TaskbarLauncher.csproj

@@ -12,8 +12,8 @@
     <Authors>Ray Berezowski</Authors>
     <ApplicationIcon>Assets\AppIcon.ico</ApplicationIcon>
     <Version>1.0.1</Version>
-    <AssemblyVersion>1.0.1.12</AssemblyVersion>
-    <FileVersion>1.0.1.12</FileVersion>
+    <AssemblyVersion>1.0.1.16</AssemblyVersion>
+    <FileVersion>1.0.1.16</FileVersion>
     <InformationalVersion>1.0.1</InformationalVersion>
   </PropertyGroup>
 

Views/LauncherPopup.xaml.cs

@@ -14,6 +14,7 @@ public partial class LauncherPopup : Window
     private const double HeaderAndChromeHeight = 118;
     private bool isRepositionQueued;
     private readonly List<System.Windows.Controls.Button> visibleLaunchButtons = [];
+    private readonly List<System.Windows.Controls.Control> visibleNavigationControls = [];
 
     private readonly LauncherConfig config;
     private readonly Action<LauncherItem> launchItem;
@@ -21,6 +22,7 @@ public partial class LauncherPopup : Window
     private readonly Action showSettings;
     private readonly Action<LauncherItem> editItem;
     private readonly Action<LauncherItem> openContainingFolder;
+    private sealed record SearchMatch(LauncherItem Item, string ParentPath);
 
     public LauncherPopup(LauncherConfig config, Action<LauncherItem> launchItem, Action<LauncherItem> openAllItems, Action showSettings, Action<LauncherItem> editItem, Action<LauncherItem> openContainingFolder)
     {
@@ -95,6 +97,7 @@ public partial class LauncherPopup : Window
     {
         ItemsPanel.Children.Clear();
         visibleLaunchButtons.Clear();
+        visibleNavigationControls.Clear();
 
         if (config.RecentItems.Any(item => !item.IsDisabled))
         {
@@ -106,6 +109,8 @@ public partial class LauncherPopup : Window
         {
             ItemsPanel.Children.Add(CreateItemControl(item, 0, expandMenusByDefault));
         }
+
+        RebuildNavigationLists();
     }
 
     private Expander CreateRecentItemsControl()
@@ -114,8 +119,12 @@ public partial class LauncherPopup : Window
         {
             Header = new TextBlock { Text = "Recent" },
             IsExpanded = true,
-            Margin = new Thickness(0, 4, 0, 8)
+            Margin = new Thickness(0, 4, 0, 8),
+            Focusable = true
         };
+        expander.KeyDown += NavigationControl_KeyDown;
+        expander.Expanded += (_, _) => RebuildNavigationAndReposition();
+        expander.Collapsed += (_, _) => RebuildNavigationAndReposition();
 
         StackPanel recentItems = new();
         foreach (LauncherItem item in config.RecentItems.Where(item => !item.IsDisabled))
@@ -135,8 +144,13 @@ public partial class LauncherPopup : Window
             {
                 Header = CreateMenuHeader(item),
                 IsExpanded = expandMenusByDefault,
-                Margin = new Thickness(depth * 12, 4, 0, 4)
+                Margin = new Thickness(depth * 12, 4, 0, 4),
+                Focusable = true,
+                Tag = item
             };
+            expander.KeyDown += NavigationControl_KeyDown;
+            expander.Expanded += (_, _) => RebuildNavigationAndReposition();
+            expander.Collapsed += (_, _) => RebuildNavigationAndReposition();
 
             StackPanel children = new();
             foreach (LauncherItem child in GetDisplayItems(item.Children))
@@ -163,20 +177,7 @@ public partial class LauncherPopup : Window
             button.ContextMenu = CreateItemContextMenu(item);
         }
 
-        button.KeyDown += (_, e) =>
-        {
-            if (e.Key == Key.Enter)
-            {
-                launchItem(item);
-                e.Handled = true;
-            }
-            else if (e.Key == Key.Escape)
-            {
-                Close();
-                e.Handled = true;
-            }
-        };
-        visibleLaunchButtons.Add(button);
+        button.KeyDown += LaunchButton_KeyDown;
         return button;
     }
 
@@ -322,8 +323,8 @@ public partial class LauncherPopup : Window
         ItemsPanel.Children.Clear();
         visibleLaunchButtons.Clear();
 
-        List<LauncherItem> matches = [];
-        CollectMatches(config.Items, query, matches);
+        List<SearchMatch> matches = [];
+        CollectMatches(config.Items, query, [], matches);
 
         if (matches.Count == 0)
         {
@@ -336,34 +337,117 @@ public partial class LauncherPopup : Window
             return;
         }
 
-        foreach (LauncherItem item in matches)
+        foreach (SearchMatch match in matches)
         {
-            ItemsPanel.Children.Add(CreateItemControl(item, 0, expandMenusByDefault: false));
+            ItemsPanel.Children.Add(CreateSearchResultControl(match));
+        }
+
+        RebuildNavigationLists();
+    }
+
+    private FrameworkElement CreateSearchResultControl(SearchMatch match)
+    {
+        System.Windows.Controls.Button button = new()
+        {
+            Content = CreateSearchResultContent(match),
+            Margin = new Thickness(0, 2, 0, 2),
+            MinHeight = Math.Max(DisplayModeMetrics.GetRowHeight(GetEffectiveDisplayMode(match.Item)), 48),
+            HorizontalContentAlignment = System.Windows.HorizontalAlignment.Left,
+            Tag = match.Item,
+            ContextMenu = CreateItemContextMenu(match.Item)
+        };
+
+        button.Click += (_, _) => launchItem(match.Item);
+        button.KeyDown += LaunchButton_KeyDown;
+
+        return button;
+    }
+
+    private void RebuildNavigationAndReposition()
+    {
+        RebuildNavigationLists();
+        QueueReposition();
+    }
+
+    private void RebuildNavigationLists()
+    {
+        visibleLaunchButtons.Clear();
+        visibleNavigationControls.Clear();
+        AddVisibleNavigationControls(ItemsPanel.Children);
+    }
+
+    private void AddVisibleNavigationControls(UIElementCollection elements)
+    {
+        foreach (UIElement element in elements)
+        {
+            switch (element)
+            {
+                case Expander expander:
+                    visibleNavigationControls.Add(expander);
+                    if (expander.IsExpanded && expander.Content is System.Windows.Controls.Panel panel)
+                    {
+                        AddVisibleNavigationControls(panel.Children);
+                    }
+
+                    break;
+
+                case System.Windows.Controls.Button button:
+                    visibleNavigationControls.Add(button);
+                    if (button.Tag is LauncherItem)
+                    {
+                        visibleLaunchButtons.Add(button);
+                    }
+
+                    break;
+            }
         }
     }
 
-    private static void CollectMatches(IEnumerable<LauncherItem> items, string query, List<LauncherItem> matches)
+    private object CreateSearchResultContent(SearchMatch match)
+    {
+        StackPanel panel = new();
+        panel.Children.Add((UIElement)CreateButtonContent(match.Item));
+
+        if (!string.IsNullOrWhiteSpace(match.ParentPath))
+        {
+            panel.Children.Add(new TextBlock
+            {
+                Text = match.ParentPath,
+                FontSize = 11,
+                Foreground = (System.Windows.Media.Brush)System.Windows.Application.Current.Resources["AppMutedTextBrush"],
+                Margin = new Thickness(0, 3, 0, 0),
+                TextTrimming = TextTrimming.CharacterEllipsis
+            });
+        }
+
+        return panel;
+    }
+
+    private static void CollectMatches(IEnumerable<LauncherItem> items, string query, List<string> parentNames, List<SearchMatch> matches)
     {
         foreach (LauncherItem item in GetDisplayItems(items))
         {
             bool isLaunchable = item.Type != LauncherItemType.Menu && !item.IsDisabled;
-            if (isLaunchable && Matches(item, query))
+            string parentPath = string.Join(" > ", parentNames);
+            if (isLaunchable && Matches(item, query, parentPath))
             {
-                matches.Add(item);
+                matches.Add(new SearchMatch(item, parentPath));
             }
 
             if (item.Children.Count > 0)
             {
-                CollectMatches(item.Children, query, matches);
+                string menuName = string.IsNullOrWhiteSpace(item.Title) ? "Untitled" : item.Title;
+                CollectMatches(item.Children, query, [.. parentNames, menuName], matches);
             }
         }
     }
 
-    private static bool Matches(LauncherItem item, string query)
+    private static bool Matches(LauncherItem item, string query, string parentPath)
     {
         return item.Title.Contains(query, StringComparison.OrdinalIgnoreCase) ||
             item.Target.Contains(query, StringComparison.OrdinalIgnoreCase) ||
-            (item.Arguments?.Contains(query, StringComparison.OrdinalIgnoreCase) ?? false);
+            (item.Arguments?.Contains(query, StringComparison.OrdinalIgnoreCase) ?? false) ||
+            parentPath.Contains(query, StringComparison.OrdinalIgnoreCase);
     }
 
     private void SearchBox_PreviewKeyDown(object sender, System.Windows.Input.KeyEventArgs e)
@@ -382,14 +466,142 @@ public partial class LauncherPopup : Window
             return;
         }
 
-        if (e.Key == Key.Down && visibleLaunchButtons.FirstOrDefault() is System.Windows.Controls.Button firstButton)
+        if (e.Key == Key.Down)
         {
-            Keyboard.ClearFocus();
-            firstButton.Focus();
+            FocusNavigationControl(0);
+            e.Handled = true;
+            return;
+        }
+
+        if (e.Key == Key.Up)
+        {
+            FocusNavigationControl(visibleNavigationControls.Count - 1);
+            e.Handled = true;
+            return;
+        }
+
+        if (e.Key == Key.Home)
+        {
+            SearchBox.CaretIndex = 0;
+            e.Handled = true;
+            return;
+        }
+
+        if (e.Key == Key.End)
+        {
+            SearchBox.CaretIndex = SearchBox.Text.Length;
             e.Handled = true;
         }
     }
 
+    private void LaunchButton_KeyDown(object sender, System.Windows.Input.KeyEventArgs e)
+    {
+        if (sender is not System.Windows.Controls.Button button)
+        {
+            return;
+        }
+
+        if (e.Key == Key.Enter && button.Tag is LauncherItem item)
+        {
+            launchItem(item);
+            e.Handled = true;
+            return;
+        }
+
+        if (e.Key == Key.Escape)
+        {
+            Close();
+            e.Handled = true;
+            return;
+        }
+
+        HandleNavigationControlKey(button, e);
+    }
+
+    private void NavigationControl_KeyDown(object sender, System.Windows.Input.KeyEventArgs e)
+    {
+        if (sender is not System.Windows.Controls.Control control)
+        {
+            return;
+        }
+
+        if (e.Key == Key.Enter && control is Expander expander)
+        {
+            expander.IsExpanded = !expander.IsExpanded;
+            QueueReposition();
+            e.Handled = true;
+            return;
+        }
+
+        if (e.Key == Key.Escape)
+        {
+            Close();
+            e.Handled = true;
+            return;
+        }
+
+        HandleNavigationControlKey(control, e);
+    }
+
+    private void HandleNavigationControlKey(System.Windows.Controls.Control control, System.Windows.Input.KeyEventArgs e)
+    {
+        int index = visibleNavigationControls.IndexOf(control);
+        if (index < 0)
+        {
+            return;
+        }
+
+        if (e.Key == Key.Down)
+        {
+            FocusNavigationControl(index + 1);
+            e.Handled = true;
+            return;
+        }
+
+        if (e.Key == Key.Up)
+        {
+            if (index == 0)
+            {
+                SearchBox.Focus();
+                SearchBox.CaretIndex = SearchBox.Text.Length;
+            }
+            else
+            {
+                FocusNavigationControl(index - 1);
+            }
+
+            e.Handled = true;
+            return;
+        }
+
+        if (e.Key == Key.Home)
+        {
+            FocusNavigationControl(0);
+            e.Handled = true;
+            return;
+        }
+
+        if (e.Key == Key.End)
+        {
+            FocusNavigationControl(visibleNavigationControls.Count - 1);
+            e.Handled = true;
+        }
+    }
+
+    private void FocusNavigationControl(int index)
+    {
+        if (visibleNavigationControls.Count == 0)
+        {
+            return;
+        }
+
+        int clampedIndex = Math.Clamp(index, 0, visibleNavigationControls.Count - 1);
+        System.Windows.Controls.Control control = visibleNavigationControls[clampedIndex];
+        Keyboard.ClearFocus();
+        control.Focus();
+        control.BringIntoView();
+    }
+
     protected override void OnKeyDown(System.Windows.Input.KeyEventArgs e)
     {
         if (e.Key == Key.Escape)

docs/INSTALL.md

@@ -26,6 +26,10 @@ Install the **.NET Desktop Runtime** for **Windows x64**.
 
 Recently launched entries appear in the launcher popup under **Recent**.
 
+Search results include the parent menu path when an item is inside a menu.
+
+Use arrow keys, Home, End, Enter, and Escape to navigate the launcher popup from the keyboard.
+
 ## Configure
 
 Open the tray menu and choose **Settings**.
@@ -43,6 +47,7 @@ From Settings you can:
 - Right-click an app or file item and choose **Open Containing Folder**
 - Use **Config... > Validate Targets** to check for missing app, file, and folder targets
 - Use **Config... > Export Selected Item** or **Import Item** to share one item or menu section
+- Right-click an item and choose **Sort This Menu** or **Sort This Level**
 - Set per-item icon sizes
 - Back up and restore `config.json`
 - Enable Start with Windows