refine

Addressing items in #40583

- [x] When navigating the context menu with the up/down keys, separators
should not be selectable.
- [x] [For context items with a super long title, we need to trim those
with an ellipsis. Ideally, we'd show a tooltip for just those
items.](https://github.com/microsoft/PowerToys/issues/40313)
- [x] [Context menu search bar text size doesn't update after changing
system text size](https://github.com/microsoft/PowerToys/issues/39648)
- [x] Weird "kick out" on first context menu item
- [x] [Primary button doesn't work if the command has more items (fix
regression)](https://github.com/microsoft/PowerToys/issues/40624)

Example of long context menu item titles with tooltips: (@niels9001,
look okay?)


https://github.com/user-attachments/assets/fc0a4034-9c22-48ee-a3f0-44fcc2f294a6

closes #40624

.github/actions/spell-check/expect.txt

@@ -218,6 +218,7 @@ coclass
 CODENAME
 codereview
 Codespaces
+Coen
 COINIT
 colid
 colorconv

.pipelines/v2/templates/job-test-project.yml

@@ -160,6 +160,7 @@ jobs:
         vsTestVersion: 'toolsInstaller'
         uiTests: true
         rerunFailedTests: true
+        testRunTitle: 'UITests_${{ parameters.platform }}_${{ parameters.installMode }}'
         # Since UITests-FancyZonesEditor.dll is generated in both UITests-FancyZonesEditor and UITests-FancyZones, removed one to avoid duplicate test runs
         testAssemblyVer2: |
           **\*UITest*.dll
@@ -182,6 +183,7 @@ jobs:
           vsTestVersion: 'toolsInstaller'
           uiTests: true
           rerunFailedTests: true
+          testRunTitle: 'UITests_${{ parameters.platform }}_${{ parameters.installMode }}'
           testAssemblyVer2: |
             **\*${{ module }}*.dll
             !**\obj\**

Directory.Packages.props

@@ -9,6 +9,7 @@
     <PackageVersion Include="Microsoft.Bot.AdaptiveExpressions.Core" Version="4.23.0" />
     <PackageVersion Include="Appium.WebDriver" Version="4.4.5" />
     <PackageVersion Include="Azure.AI.OpenAI" Version="1.0.0-beta.17" />
+    <PackageVersion Include="CoenM.ImageSharp.ImageHash" Version="1.3.6" />
     <PackageVersion Include="CommunityToolkit.Common" Version="8.4.0" />
     <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
     <PackageVersion Include="CommunityToolkit.WinUI.Animations" Version="8.2.250402" />

NOTICE.md

@@ -1496,6 +1496,7 @@ SOFTWARE.
 - AdaptiveCards.Templating 2.0.5
 - Appium.WebDriver 4.4.5
 - Azure.AI.OpenAI 1.0.0-beta.17
+- CoenM.ImageSharp.ImageHash 1.3.6
 - CommunityToolkit.Common 8.4.0
 - CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock 0.1.250703-build.2173
 - CommunityToolkit.Mvvm 8.4.0

src/common/UITestAutomation/UITestAutomation.csproj

@@ -20,6 +20,7 @@
     <PackageReference Include="System.Net.Http" />
     <PackageReference Include="System.Private.Uri" />
     <PackageReference Include="System.Text.RegularExpressions" />
+    <PackageReference Include="CoenM.ImageSharp.ImageHash" />
   </ItemGroup>
 
 </Project>

src/common/UITestAutomation/VisualAssert.cs

@@ -6,7 +6,11 @@ using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Drawing;
 using System.IO;
+using CoenM.ImageHash;
+using CoenM.ImageHash.HashAlgorithms;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.PixelFormats;
 
 namespace Microsoft.PowerToys.UITest
 {
@@ -127,34 +131,75 @@ namespace Microsoft.PowerToys.UITest
         }
 
         /// <summary>
-        /// Test if two images are equal bit-by-bit
+        /// Test if two images are equal using ImageHash comparison
         /// </summary>
         /// <param name="baselineImage">baseline image</param>
         /// <param name="testImage">test image</param>
         /// <returns>true if are equal,otherwise false</returns>
         private static bool AreEqual(Bitmap baselineImage, Bitmap testImage)
         {
-            if (baselineImage.Width != testImage.Width || baselineImage.Height != testImage.Height)
+            try
             {
-                return false;
+                // Define a threshold for similarity percentage
+                const int SimilarityThreshold = 95;
+
+                // Use CoenM.ImageHash for perceptual hash comparison
+                var hashAlgorithm = new AverageHash();
+
+                // Convert System.Drawing.Bitmap to SixLabors.ImageSharp.Image
+                using var baselineImageSharp = ConvertBitmapToImageSharp(baselineImage);
+                using var testImageSharp = ConvertBitmapToImageSharp(testImage);
+
+                // Calculate hashes for both images
+                var baselineHash = hashAlgorithm.Hash(baselineImageSharp);
+                var testHash = hashAlgorithm.Hash(testImageSharp);
+
+                // Compare hashes using CompareHash method
+                // Returns similarity percentage (0-100, where 100 is identical)
+                var similarity = CompareHash.Similarity(baselineHash, testHash);
+
+                // Consider images equal if similarity is very high
+                // Allow for minor rendering differences (threshold can be adjusted)
+                return similarity >= SimilarityThreshold; // 95% similarity threshold
             }
-
-            // WinAppDriver sometimes adds a border to the screenshot (around 2 pix width), and it is not always consistent.
-            // So we exclude the border when comparing the images, and usually it is the edge of the windows, won't affect the comparison.
-            int excludeBorderWidth = 5, excludeBorderHeight = 5;
-
-            for (int x = excludeBorderWidth; x < baselineImage.Width - excludeBorderWidth; x++)
+            catch
             {
-                for (int y = excludeBorderHeight; y < baselineImage.Height - excludeBorderHeight; y++)
+                // Fallback to pixel-by-pixel comparison if hash comparison fails
+                if (baselineImage.Width != testImage.Width || baselineImage.Height != testImage.Height)
                 {
-                    if (!VisualHelper.PixIsSame(baselineImage.GetPixel(x, y), testImage.GetPixel(x, y)))
+                    return false;
+                }
+
+                // WinAppDriver sometimes adds a border to the screenshot (around 2 pix width), and it is not always consistent.
+                // So we exclude the border when comparing the images, and usually it is the edge of the windows, won't affect the comparison.
+                int excludeBorderWidth = 5, excludeBorderHeight = 5;
+
+                for (int x = excludeBorderWidth; x < baselineImage.Width - excludeBorderWidth; x++)
+                {
+                    for (int y = excludeBorderHeight; y < baselineImage.Height - excludeBorderHeight; y++)
                     {
-                        return false;
+                        if (!VisualHelper.PixIsSame(baselineImage.GetPixel(x, y), testImage.GetPixel(x, y)))
+                        {
+                            return false;
+                        }
                     }
                 }
-            }
 
-            return true;
+                return true;
+            }
+        }
+
+        /// <summary>
+        /// Convert System.Drawing.Bitmap to SixLabors.ImageSharp.Image
+        /// </summary>
+        /// <param name="bitmap">The bitmap to convert</param>
+        /// <returns>ImageSharp Image</returns>
+        private static Image<Rgba32> ConvertBitmapToImageSharp(Bitmap bitmap)
+        {
+            using var memoryStream = new MemoryStream();
+            bitmap.Save(memoryStream, System.Drawing.Imaging.ImageFormat.Png);
+            memoryStream.Position = 0;
+            return SixLabors.ImageSharp.Image.Load<Rgba32>(memoryStream);
         }
     }
 }

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/CommandBarViewModel.cs

@@ -149,6 +149,7 @@ public partial class CommandBarViewModel : ObservableObject,
 
         if (command.HasMoreCommands)
         {
+            WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(command.Command.Model, command.Model));
             return ContextKeybindingResult.KeepOpen;
         }
         else

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ContextMenuViewModel.cs

@@ -22,15 +22,8 @@ public partial class ContextMenuViewModel : ObservableObject,
         get => field;
         set
         {
-            if (field != null)
-            {
-                field.PropertyChanged -= SelectedItemPropertyChanged;
-            }
-
             field = value;
-            SetSelectedItem(value);
-
-            OnPropertyChanged(nameof(SelectedItem));
+            UpdateContextItems();
         }
     }
 
@@ -68,33 +61,6 @@ public partial class ContextMenuViewModel : ObservableObject,
         OnPropertyChanged(nameof(FilterOnTop));
     }
 
-    private void SetSelectedItem(ICommandBarContext? value)
-    {
-        if (value != null)
-        {
-            value.PropertyChanged += SelectedItemPropertyChanged;
-        }
-        else
-        {
-            if (SelectedItem != null)
-            {
-                SelectedItem.PropertyChanged -= SelectedItemPropertyChanged;
-            }
-        }
-
-        UpdateContextItems();
-    }
-
-    private void SelectedItemPropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
-    {
-        switch (e.PropertyName)
-        {
-            case nameof(SelectedItem.HasMoreCommands):
-                UpdateContextItems();
-                break;
-        }
-    }
-
     public void UpdateContextItems()
     {
         if (SelectedItem != null)

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

@@ -6,13 +6,11 @@ using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CmdPal.UI.Views;
-using Microsoft.UI.Input;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Controls.Primitives;
 using Microsoft.UI.Xaml.Input;
 using Windows.System;
-using Windows.UI.Core;
 
 namespace Microsoft.CmdPal.UI.Controls;
 

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ContextMenu.xaml

@@ -20,6 +20,7 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <cmdpalUI:KeyChordToStringConverter x:Key="KeyChordToStringConverter" />
+            <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
 
             <cmdpalUI:ContextItemTemplateSelector
                 x:Key="ContextItemTemplateSelector"
@@ -43,9 +44,18 @@
                         SourceKey="{x:Bind Icon}"
                         SourceRequested="{x:Bind help:IconCacheProvider.SourceRequested}" />
                     <TextBlock
+                        x:Name="TitleTextBlock"
                         Grid.Column="1"
+                        MaxWidth="200"
+                        HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Text="{x:Bind Title}" />
+                        Text="{x:Bind Title}"
+                        TextTrimming="WordEllipsis"
+                        TextWrapping="NoWrap">
+                        <ToolTipService.ToolTip>
+                            <ToolTip Content="{x:Bind Title}" Visibility="{Binding IsTextTrimmed, ElementName=TitleTextBlock, Converter={StaticResource BoolToVisibilityConverter}}" />
+                        </ToolTipService.ToolTip>
+                    </TextBlock>
                     <TextBlock
                         Grid.Column="2"
                         Margin="16,0,0,0"
@@ -74,10 +84,19 @@
                         SourceKey="{x:Bind Icon}"
                         SourceRequested="{x:Bind help:IconCacheProvider.SourceRequested}" />
                     <TextBlock
+                        x:Name="TitleTextBlock"
                         Grid.Column="1"
+                        MaxWidth="200"
+                        HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         Style="{StaticResource ContextItemTitleTextBlockCriticalStyle}"
-                        Text="{x:Bind Title}" />
+                        Text="{x:Bind Title}"
+                        TextTrimming="WordEllipsis"
+                        TextWrapping="NoWrap">
+                        <ToolTipService.ToolTip>
+                            <ToolTip Content="{x:Bind Title}" Visibility="{Binding IsTextTrimmed, ElementName=TitleTextBlock, Converter={StaticResource BoolToVisibilityConverter}}" />
+                        </ToolTipService.ToolTip>
+                    </TextBlock>
                     <TextBlock
                         Grid.Column="2"
                         Margin="16,0,0,0"
@@ -129,6 +148,7 @@
             x:Name="ContextFilterBox"
             x:Uid="ContextFilterBox"
             Margin="4"
+            IsTextScaleFactorEnabled="True"
             KeyDown="ContextFilterBox_KeyDown"
             PreviewKeyDown="ContextFilterBox_PreviewKeyDown"
             TextChanged="ContextFilterBox_TextChanged" />

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

@@ -178,34 +178,97 @@ public sealed partial class ContextMenu : UserControl,
     {
         if (e.Key == VirtualKey.Up)
         {
-            // navigate previous
-            if (CommandsDropdown.SelectedIndex > 0)
-            {
-                CommandsDropdown.SelectedIndex--;
-            }
-            else
-            {
-                CommandsDropdown.SelectedIndex = CommandsDropdown.Items.Count - 1;
-            }
+            NavigateUp();
 
             e.Handled = true;
         }
         else if (e.Key == VirtualKey.Down)
         {
-            // navigate next
-            if (CommandsDropdown.SelectedIndex < CommandsDropdown.Items.Count - 1)
-            {
-                CommandsDropdown.SelectedIndex++;
-            }
-            else
-            {
-                CommandsDropdown.SelectedIndex = 0;
-            }
+            NavigateDown();
 
             e.Handled = true;
         }
     }
 
+    private void NavigateUp()
+    {
+        var newIndex = CommandsDropdown.SelectedIndex;
+
+        if (CommandsDropdown.SelectedIndex > 0)
+        {
+            newIndex--;
+
+            while (
+                newIndex >= 0 &&
+                IsSeparator(CommandsDropdown.Items[newIndex]) &&
+                newIndex != CommandsDropdown.SelectedIndex)
+            {
+                newIndex--;
+            }
+
+            if (newIndex < 0)
+            {
+                newIndex = CommandsDropdown.Items.Count - 1;
+
+                while (
+                    newIndex >= 0 &&
+                    IsSeparator(CommandsDropdown.Items[newIndex]) &&
+                    newIndex != CommandsDropdown.SelectedIndex)
+                {
+                    newIndex--;
+                }
+            }
+        }
+        else
+        {
+            newIndex = CommandsDropdown.Items.Count - 1;
+        }
+
+        CommandsDropdown.SelectedIndex = newIndex;
+    }
+
+    private void NavigateDown()
+    {
+        var newIndex = CommandsDropdown.SelectedIndex;
+
+        if (CommandsDropdown.SelectedIndex == CommandsDropdown.Items.Count - 1)
+        {
+            newIndex = 0;
+        }
+        else
+        {
+            newIndex++;
+
+            while (
+                newIndex < CommandsDropdown.Items.Count &&
+                IsSeparator(CommandsDropdown.Items[newIndex]) &&
+                newIndex != CommandsDropdown.SelectedIndex)
+            {
+                newIndex++;
+            }
+
+            if (newIndex >= CommandsDropdown.Items.Count)
+            {
+                newIndex = 0;
+
+                while (
+                    newIndex < CommandsDropdown.Items.Count &&
+                    IsSeparator(CommandsDropdown.Items[newIndex]) &&
+                    newIndex != CommandsDropdown.SelectedIndex)
+                {
+                    newIndex++;
+                }
+            }
+        }
+
+        CommandsDropdown.SelectedIndex = newIndex;
+    }
+
+    private bool IsSeparator(object item)
+    {
+        return item is SeparatorContextItemViewModel;
+    }
+
     private void UpdateUiForStackChange()
     {
         ContextFilterBox.Text = string.Empty;

src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleListPage.cs

@@ -99,7 +99,7 @@ internal sealed partial class SampleListPage : ListPage
                             new CommandContextItem(
                                 new ToastCommand("Nested B invoked") { Name = "Do it", Icon = new IconInfo("B") })
                             {
-                                Title = "Nested B...",
+                                Title = "Nested B with a really, really long title that should be trimmed",
                                 RequestedShortcut = KeyChordHelpers.FromModifiers(ctrl: true, vkey: VirtualKey.B),
                                 MoreCommands = [
                                     new CommandContextItem(