add a 'customize' item to the context menu of the bar itself

Author: zadjii-msft

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/OpenSettingsCommand.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -19,7 +19,7 @@ public OpenSettingsCommand()
 
     public override ICommandResult Invoke()
     {
-        WeakReferenceMessenger.Default.Send<OpenSettingsMessage>();
+        WeakReferenceMessenger.Default.Send<OpenSettingsMessage>(new());
         return CommandResult.KeepOpen();
     }
 }

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Dock/DockViewModel.cs

@@ -7,6 +7,7 @@
 using ManagedCommon;
 using Microsoft.CmdPal.Core.Common;
 using Microsoft.CmdPal.Core.ViewModels;
+using Microsoft.CmdPal.UI.Messages;
 using Microsoft.CmdPal.UI.ViewModels.Messages;
 using Microsoft.CmdPal.UI.ViewModels.Settings;
 using Microsoft.CommandPalette.Extensions.Toolkit;
@@ -122,6 +123,35 @@ private void DoOnUiThread(Action action)
             TaskCreationOptions.None,
             Scheduler);
     }
+
+    public CommandItemViewModel GetContextMenuForDock()
+    {
+        var model = new DockContextMenuItem();
+        var vm = new CommandItemViewModel(new(model), new(this));
+        vm.SlowInitializeProperties();
+        return vm;
+    }
+
+    private sealed partial class DockContextMenuItem : CommandItem
+    {
+        public DockContextMenuItem()
+        {
+            var openSettingsCommand = new AnonymousCommand(
+                action: () =>
+                {
+                    WeakReferenceMessenger.Default.Send(new OpenSettingsMessage("Dock"));
+                })
+            {
+                Name = "Customize", // TODO!Loc
+                Icon = Icons.SettingsIcon,
+            };
+
+            MoreCommands = new CommandContextItem[]
+            {
+                new CommandContextItem(openSettingsCommand),
+            };
+        }
+    }
 }
 
 #pragma warning restore SA1402 // File may only contain a single type

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Icons.cs

@@ -11,4 +11,6 @@ internal sealed class Icons
     internal static IconInfo PinIcon => new("\uE718"); // Pin icon
 
     internal static IconInfo UnpinIcon => new("\uE77A"); // Unpin icon
+
+    internal static IconInfo SettingsIcon => new("\uE713"); // Settings icon
 }

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Messages/OpenSettingsMessage.cs

@@ -4,6 +4,6 @@
 
 namespace Microsoft.CmdPal.UI.Messages;
 
-public record OpenSettingsMessage()
+public record OpenSettingsMessage(string? Page = null)
 {
 }

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/CommandBar.xaml.cs

@@ -126,7 +126,7 @@ private void SecondaryButton_Clicked(object sender, RoutedEventArgs e)
 
     private void SettingsIcon_Clicked(object sender, RoutedEventArgs e)
     {
-        WeakReferenceMessenger.Default.Send<OpenSettingsMessage>();
+        WeakReferenceMessenger.Default.Send<OpenSettingsMessage>(new());
     }
 
     private void MoreCommandsButton_Clicked(object sender, RoutedEventArgs e)

src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml

@@ -232,6 +232,7 @@
     <Grid
         x:Name="RootGrid"
         BorderBrush="{ThemeResource SurfaceStrokeColorDefaultBrush}"
+        RightTapped="RootGrid_RightTapped"
         BorderThickness="0,0,0,1">
         <Grid x:Name="ContentGrid" Padding="0,0,0,0">
             <Grid.ColumnDefinitions>

src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockControl.xaml.cs

@@ -243,6 +243,25 @@ public void Receive(CloseContextMenuMessage message)
             ContextMenuFlyout.Hide();
         }
     }
+
+    private void RootGrid_RightTapped(object sender, Microsoft.UI.Xaml.Input.RightTappedRoutedEventArgs e)
+    {
+        var pos = e.GetPosition(null);
+        var item = this.ViewModel.GetContextMenuForDock();
+        if (item.HasMoreCommands)
+        {
+            ContextControl.ViewModel.SelectedItem = item;
+            ContextMenuFlyout.ShowAt(
+            this.RootGrid,
+            new FlyoutShowOptions()
+            {
+                ShowMode = FlyoutShowMode.Standard,
+                Placement = FlyoutPlacementMode.TopEdgeAlignedRight,
+                Position = pos,
+            });
+            e.Handled = true;
+        }
+    }
 }
 
 #pragma warning restore SA1402 // File may only contain a single type

src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/TrayIconService.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -152,7 +152,7 @@ private LRESULT WindowProc(
                 {
                     if (wParam == PInvoke.WM_USER + 1)
                     {
-                        WeakReferenceMessenger.Default.Send<OpenSettingsMessage>();
+                        WeakReferenceMessenger.Default.Send<OpenSettingsMessage>(new());
                     }
                     else if (wParam == PInvoke.WM_USER + 2)
                     {

src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml.cs

@@ -257,17 +257,23 @@ public void Receive(OpenSettingsMessage message)
     {
         _ = DispatcherQueue.TryEnqueue(() =>
         {
-            OpenSettings();
+            OpenSettings(message.Page);
         });
     }
 
-    public void OpenSettings()
+    public void OpenSettings(string? page = null)
     {
         if (_settingsWindow is null)
         {
             _settingsWindow = new SettingsWindow();
         }
 
+        if (page is not null)
+        {
+            _settingsWindow.OpenToPage = page;
+            _settingsWindow.Navigate(page);
+        }
+
         _settingsWindow.Activate();
         _settingsWindow.BringToFront();
     }

src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/SettingsWindow.xaml.cs

@@ -10,7 +10,6 @@
 using Microsoft.CmdPal.UI.ViewModels.Messages;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Automation.Peers;
 using Microsoft.UI.Xaml.Controls;
 using WinUIEx;
 using RS_ = Microsoft.CmdPal.UI.Helpers.ResourceLoaderInstance;
@@ -25,7 +24,9 @@ public sealed partial class SettingsWindow : WindowEx,
     public ObservableCollection<Crumb> BreadCrumbs { get; } = [];
 
     // Gets or sets optional action invoked after NavigationView is loaded.
-    public Action NavigationViewLoaded { get; set; } = () => { };
+    public Action? NavigationViewLoaded { get; set; }
+
+    internal string? OpenToPage { get; set; }
 
     public SettingsWindow()
     {
@@ -50,7 +51,9 @@ private void NavView_Loaded(object sender, RoutedEventArgs e)
         Task.Delay(500).ContinueWith(_ => this.NavigationViewLoaded?.Invoke(), TaskScheduler.FromCurrentSynchronizationContext());
 
         NavView.SelectedItem = NavView.MenuItems[0];
-        Navigate("General");
+
+        Navigate(OpenToPage);
+        OpenToPage = null;
 
         if (sender is NavigationView navigationView)
         {
@@ -77,20 +80,34 @@ private void NavView_ItemInvoked(NavigationView sender, NavigationViewItemInvoke
         Navigate((selectedItem.Tag as string)!);
     }
 
-    private void Navigate(string page)
+    internal void Navigate(string? page)
     {
         var pageType = page switch
         {
+            null => typeof(GeneralPage),
             "General" => typeof(GeneralPage),
             "Extensions" => typeof(ExtensionsPage),
             "Dock" => typeof(DockSettingsPage),
             _ => null,
         };
+        var actualPage = page ?? "General";
         if (pageType is not null)
         {
             BreadCrumbs.Clear();
-            BreadCrumbs.Add(new(page, page));
+            BreadCrumbs.Add(new(actualPage, actualPage));
             NavFrame.Navigate(pageType);
+
+            // Now, make sure to actually select the correct menu item too
+            foreach (var obj in NavView.MenuItems)
+            {
+                if (obj is NavigationViewItem item)
+                {
+                    if (item.Tag is string s && s == page)
+                    {
+                        NavView.SelectedItem = item;
+                    }
+                }
+            }
         }
     }