Merge origin/main into stable

Author: LegendaryBlair

.github/actions/spell-check/allow/code.txt

@@ -330,7 +330,9 @@ MRUINFO
 REGSTR
 
 # Misc Win32 APIs and PInvokes
+DEFAULTTONEAREST
 INVOKEIDLIST
+LCMAP
 MEMORYSTATUSEX
 ABE
 Mdt
@@ -394,3 +396,10 @@ Nonpaged
 
 # XAML
 Untargeted
+
+# Program names
+SEARCHHOST
+SHELLEXPERIENCEHOST
+SHELLHOST
+STARTMENUEXPERIENCEHOST
+WIDGETBOARD

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

@@ -1368,6 +1368,7 @@ POINTERUPDATE
 Pokedex
 Pomodoro
 Popups
+popups
 POPUPWINDOW
 POSITIONITEM
 POWERBROADCAST

README.md

@@ -50,18 +50,18 @@ But to get started quickly, choose one of the installation methods below:
 Go to the [PowerToys GitHub releases](https://aka.ms/installPowerToys), select **Assets** to reveal the installation files, and choose the one that matches your architecture and install scope. For most devices, that would be _x64 per-user_.
 
 <!-- items that need to be updated release to release -->
-[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.99%22
-[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.98.1/PowerToysUserSetup-0.98.1-x64.exe
-[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.98.1/PowerToysUserSetup-0.98.1-arm64.exe
-[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.98.1/PowerToysSetup-0.98.1-x64.exe
-[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.98.1/PowerToysSetup-0.98.1-arm64.exe
+[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.100%22
+[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.99.0/PowerToysUserSetup-0.99.0-x64.exe
+[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.99.0/PowerToysUserSetup-0.99.0-arm64.exe
+[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.99.0/PowerToysSetup-0.99.0-x64.exe
+[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.99.0/PowerToysSetup-0.99.0-arm64.exe
 
 | Description | Filename |
 | --- | --- |
-| Per user - x64       | [PowerToysUserSetup-0.98.1-x64.exe][ptUserX64] |
-| Per user - ARM64     | [PowerToysUserSetup-0.98.1-arm64.exe][ptUserArm64] |
-| Machine wide - x64   | [PowerToysSetup-0.98.1-x64.exe][ptMachineX64] |
-| Machine wide - ARM64 | [PowerToysSetup-0.98.1-arm64.exe][ptMachineArm64] |
+| Per user - x64       | [PowerToysUserSetup-0.99.0-x64.exe][ptUserX64] |
+| Per user - ARM64     | [PowerToysUserSetup-0.99.0-arm64.exe][ptUserArm64] |
+| Machine wide - x64   | [PowerToysSetup-0.99.0-x64.exe][ptMachineX64] |
+| Machine wide - ARM64 | [PowerToysSetup-0.99.0-arm64.exe][ptMachineArm64] |
 
 </details>
 
@@ -106,11 +106,11 @@ There are [community driven install methods](https://learn.microsoft.com/windows
 
 [![What's new image](doc/images/readme/Release-Banner.png)](https://github.com/microsoft/PowerToys/releases)
 
-To see what's new, check out the [release notes](https://github.com/microsoft/PowerToys/releases/tag/v0.98.1).
+To see what's new, check out the [release notes](https://github.com/microsoft/PowerToys/releases/tag/v0.99.0).
 
 ## 🛣️ Roadmap
 
-We are planning some nice new features and improvements for the next releases – PowerDisplay, Command Palette improvements and a brand-new Shortcut Guide experience! Stay tuned for [v0.99][github-next-release-work]!
+We are planning some nice new features and improvements for the next releases – a brand-new Shortcut Guide experience, ensuring it's easier to find and install Command Palette extensions and so much more! Stay tuned for [v0.100][github-next-release-work]!
 
 ## ❤️ PowerToys Community
 

doc/images/readme/Release-Banner.png

@@ -579,14 +579,16 @@ static void StopResizing()
     HideOverlay();
 }
 
-static void ReplayAbsorbedAlt()
+static void ReplayAbsorbedModifier(bool alsoKeyUp)
 {
-    INPUT keyboardInput = {};
-    keyboardInput.type = INPUT_KEYBOARD;
-    keyboardInput.ki.wVk = static_cast<WORD>(g_absorbedVk);
-    keyboardInput.ki.wScan = static_cast<WORD>(g_absorbedScanCode);
-    keyboardInput.ki.dwFlags = (g_absorbedFlags & LLKHF_EXTENDED) ? KEYEVENTF_EXTENDEDKEY : 0;
-    SendInput(1, &keyboardInput, sizeof(INPUT));
+    INPUT inputs[2] = {};
+    inputs[0].type = INPUT_KEYBOARD;
+    inputs[0].ki.wVk = static_cast<WORD>(g_absorbedVk);
+    inputs[0].ki.wScan = static_cast<WORD>(g_absorbedScanCode);
+    inputs[0].ki.dwFlags = (g_absorbedFlags & LLKHF_EXTENDED) ? KEYEVENTF_EXTENDEDKEY : 0;
+    inputs[1] = inputs[0];
+    inputs[1].ki.dwFlags |= KEYEVENTF_KEYUP;
+    SendInput(alsoKeyUp ? 2 : 1, inputs, sizeof(INPUT));
 }
 
 // ---------------------------------------------------------------------------
@@ -632,16 +634,111 @@ static void ShowTrayMenu(HWND hwnd)
 
 static bool IsSystemClass(HWND hwnd)
 {
-    wchar_t cls[64] = {};
-    GetClassNameW(hwnd, cls, 64);
-    return (wcscmp(cls, L"Progman") == 0 || wcscmp(cls, L"Shell_TrayWnd") == 0);
+    wchar_t cls[256] = {};
+    GetClassNameW(hwnd, cls, ARRAYSIZE(cls));
+
+    // Desktop and primary/secondary taskbars
+    if (wcscmp(cls, L"Progman") == 0 ||
+        wcscmp(cls, L"Shell_TrayWnd") == 0 ||
+        wcscmp(cls, L"Shell_SecondaryTrayWnd") == 0)
+        return true;
+
+    // System tray / notification area popups and overflow
+    if (wcscmp(cls, L"NotifyIconOverflowWindow") == 0 ||
+        wcscmp(cls, L"TopLevelWindowForOverflowXamlIsland") == 0)
+        return true;
+
+    // Tooltips (e.g. "Show hidden icons" tooltip)
+    if (wcscmp(cls, L"tooltips_class32") == 0)
+        return true;
+
+    // Task View (Win+Tab)
+    if (wcscmp(cls, L"MultitaskingViewFrame") == 0 ||
+        wcscmp(cls, L"XamlExplorerHostIslandWindow") == 0)
+        return true;
+
+    // System tray flyouts (Quick Settings, calendar, input switcher)
+    if (wcscmp(cls, L"Windows.UI.Composition.DesktopWindowContentBridge") == 0 ||
+        wcscmp(cls, L"Shell_InputSwitchTopLevelWindow") == 0)
+        return true;
+
+    return false;
+}
+
+
+std::wstring ToUpperInvariant(std::wstring_view input)
+{
+    int required = LCMapStringEx(
+        LOCALE_NAME_INVARIANT,
+        LCMAP_UPPERCASE,
+        input.data(),
+        static_cast<int>(input.size()),
+        nullptr,
+        0,
+        nullptr,
+        nullptr,
+        0);
+
+    std::wstring result(required, L'\0');
+
+    LCMapStringEx(
+        LOCALE_NAME_INVARIANT,
+        LCMAP_UPPERCASE,
+        input.data(),
+        static_cast<int>(input.size()),
+        result.data(),
+        required,
+        nullptr,
+        nullptr,
+        0);
+
+    return result;
 }
 
 static bool IsExcluded(HWND hwnd)
 {
     if (IsSystemClass(hwnd))
         return true;
 
+    // To identify these for adding a new exception:
+    // 1. Resolve the hwnd class name.
+    // 2. Resolve the process path.
+    // 3. Add OutputDebugStringW() for the class name and process path.
+    // 4. Build the executable.
+    // 5. Check with the debugger (or with Sysinternals DebugView) the outputs.
+    // 6. Delete the added code.
+    // 7. Add the exception below, according to the pattern there.
+    //
+    // Shell experience windows: Start menu, Notifications (Win+N), Search,
+    // Quick Settings (volume / network / battery).
+    // These use the generic Windows.UI.Core.CoreWindow class, so filter by process.
+    {
+        wchar_t cls[256] = {};
+        GetClassNameW(hwnd, cls, ARRAYSIZE(cls));
+        if (wcscmp(cls, L"Windows.UI.Core.CoreWindow") == 0)
+        {
+            std::wstring processPath = ToUpperInvariant(get_process_path(hwnd));
+            if (processPath.find(L"STARTMENUEXPERIENCEHOST.EXE") != std::wstring::npos ||
+                processPath.find(L"SHELLEXPERIENCEHOST.EXE") != std::wstring::npos ||
+                processPath.find(L"SEARCHHOST.EXE") != std::wstring::npos)
+                return true;
+        }
+        else if (wcscmp(cls, L"ControlCenterWindow") == 0)
+        {
+            // The Quick Settings flyout.
+            std::wstring processPath = ToUpperInvariant(get_process_path(hwnd));
+            if (processPath.find(L"SHELLHOST.EXE") != std::wstring::npos)
+                return true;
+        }
+        else if (wcscmp(cls, L"WindowsDashboard") == 0)
+        {
+            // The Windows 11 Widgets flyout.
+            std::wstring processPath = ToUpperInvariant(get_process_path(hwnd));
+            if (processPath.find(L"WIDGETBOARD.EXE") != std::wstring::npos)
+                return true;
+        }
+    }
+
     auto apps = g_excludedApps.load();
     if (!apps || apps->empty())
         return false;
@@ -735,8 +832,9 @@ static LRESULT CALLBACK KeyboardProc(int nCode, WPARAM wParam, LPARAM lParam)
                         g_dragConsumedAlt = false;
                         return 1;
                     }
-                    // No drag happened; replay the keydown, then let keyup through
-                    ReplayAbsorbedAlt();
+                    // No drag happened; replay the keydown, THEN the keyup
+                    ReplayAbsorbedModifier(true);
+                    return 1; // swallow this keyup since the replay already sent one
                 }
             }
             goto forward; // let Win keyup pass through
@@ -793,7 +891,7 @@ static LRESULT CALLBACK KeyboardProc(int nCode, WPARAM wParam, LPARAM lParam)
                             return 1;
                         }
                         // No drag happened; replay the keydown, then let keyup through
-                        ReplayAbsorbedAlt();
+                        ReplayAbsorbedModifier(false);
                     }
                 }
             }
@@ -803,7 +901,8 @@ static LRESULT CALLBACK KeyboardProc(int nCode, WPARAM wParam, LPARAM lParam)
                 if (g_altAbsorbed && !g_dragConsumedAlt)
                 {
                     g_altAbsorbed = false;
-                    ReplayAbsorbedAlt();
+                    g_altPressed = false;
+                    ReplayAbsorbedModifier(false);
                 }
             }
         }
@@ -813,7 +912,7 @@ static LRESULT CALLBACK KeyboardProc(int nCode, WPARAM wParam, LPARAM lParam)
         {
             g_winAbsorbed = false;
             g_winPressed = false;
-            ReplayAbsorbedAlt();
+            ReplayAbsorbedModifier(false);
         }
 
         // Track held non-modifier keys (used to suppress GrabAndMove when the modifier

src/modules/GrabAndMove/GrabAndMove/main.cpp

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.Immutable;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.CmdPal.UI.ViewModels;
 
@@ -11,9 +12,21 @@ public record AppStateModel
     ///////////////////////////////////////////////////////////////////////////
     // STATE HERE
     // Make sure that any new types you add are added to JsonSerializationContext!
-    public RecentCommandsManager RecentCommands { get; init; } = new();
+    private RecentCommandsManager? _recentCommands = new();
 
-    public ImmutableList<string> RunHistory { get; init; } = ImmutableList<string>.Empty;
+    public RecentCommandsManager RecentCommands
+    {
+        get => _recentCommands ?? new();
+        init => _recentCommands = value;
+    }
+
+    private ImmutableList<string>? _runHistory = ImmutableList<string>.Empty;
+
+    public ImmutableList<string> RunHistory
+    {
+        get => _runHistory ?? ImmutableList<string>.Empty;
+        init => _runHistory = value;
+    }
 
     // END SETTINGS
     ///////////////////////////////////////////////////////////////////////////

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

@@ -46,45 +46,6 @@ public string Description
 
     public IconInfoViewModel Icon => _adapter.IconViewModel;
 
-    private ShowLabelsOption _showLabels;
-
-    public ShowLabelsOption ShowLabels
-    {
-        get => _showLabels;
-        set
-        {
-            if (value != _showLabels)
-            {
-                _showLabels = value;
-                var newShowTitles = value switch
-                {
-                    ShowLabelsOption.Default => (bool?)null,
-                    ShowLabelsOption.ShowLabels => true,
-                    ShowLabelsOption.HideLabels => false,
-                    _ => null,
-                };
-                UpdateModel(_dockSettingsModel with { ShowTitles = newShowTitles });
-            }
-        }
-    }
-
-    private ShowLabelsOption FetchShowLabels()
-    {
-        if (_dockSettingsModel.ShowLabels == null)
-        {
-            return ShowLabelsOption.Default;
-        }
-
-        return _dockSettingsModel.ShowLabels.Value ? ShowLabelsOption.ShowLabels : ShowLabelsOption.HideLabels;
-    }
-
-    // used to map to ComboBox selection
-    public int ShowLabelsIndex
-    {
-        get => (int)ShowLabels;
-        set => ShowLabels = (ShowLabelsOption)value;
-    }
-
     private DockPinSide PinSide
     {
         get => _pinSide;
@@ -138,7 +99,6 @@ public DockBandSettingsViewModel(
         _bandViewModel = bandViewModel;
         _settingsService = settingsService;
         _pinSide = FetchPinSide();
-        _showLabels = FetchShowLabels();
     }
 
     private DockPinSide FetchPinSide()

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

@@ -559,7 +559,7 @@ public void AddBandToSection(TopLevelViewModel topLevel, DockPinSide targetSide)
         }
 
         // Create settings for the new band
-        var bandSettings = new DockBandSettings { ProviderId = topLevel.CommandProviderId, CommandId = bandId, ShowLabels = null };
+        var bandSettings = new DockBandSettings { ProviderId = topLevel.CommandProviderId, CommandId = bandId };
         var dockSettings = _settings;
 
         // Create the band view model

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Dock/DockViewModel.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.
 
@@ -18,12 +18,24 @@ public record ProviderSettings
 
     public bool IsEnabled { get; init; } = true;
 
-    public ImmutableDictionary<string, FallbackSettings> FallbackCommands { get; init; }
+    private ImmutableDictionary<string, FallbackSettings>? _fallbackCommands
         = ImmutableDictionary<string, FallbackSettings>.Empty;
 
-    public ImmutableList<string> PinnedCommandIds { get; init; }
+    public ImmutableDictionary<string, FallbackSettings> FallbackCommands
+    {
+        get => _fallbackCommands ?? ImmutableDictionary<string, FallbackSettings>.Empty;
+        init => _fallbackCommands = value;
+    }
+
+    private ImmutableList<string>? _pinnedCommandIds
         = ImmutableList<string>.Empty;
 
+    public ImmutableList<string> PinnedCommandIds
+    {
+        get => _pinnedCommandIds ?? ImmutableList<string>.Empty;
+        init => _pinnedCommandIds = value;
+    }
+
     [JsonIgnore]
     public string ProviderId { get; init; } = string.Empty;
 
@@ -37,7 +49,6 @@ public ProviderSettings()
     {
     }
 
-    [JsonConstructor]
     public ProviderSettings(bool isEnabled)
     {
         IsEnabled = isEnabled;