+
Date: Thu, 23 Oct 2025 23:53:06 +0200
Subject: [PATCH 06/59] CmdPal: Migrate bookmarks manually (#42814)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
## Summary of the Pull Request
This PR fixes the migration of bookmarks from versions prior to 0.95,
resolving an issue where hotkeys and aliases wouldn’t persist on
bookmarks created with Command Palette 0.94 or earlier.
It removes ID auto-fixing from `BookmarkData` in favor of an explicit
migration step handled by `BookmarkManager`.
## PR Checklist
- [x] Closes: #42796
- [ ] **Communication:** I've discussed this with core contributors
already. If the work hasn't been agreed, this work might be rejected
- [ ] **Tests:** Added/updated and all pass
- [ ] **Localization:** All end-user-facing strings can be localized
- [ ] **Dev docs:** Added/updated
- [ ] **New binaries:** Added on the required places
- [ ] [JSON for
signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json)
for new binaries
- [ ] [WXS for
installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs)
for new binaries and localization folder
- [ ] [YML for CI
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml)
for new test projects
- [ ] [YML for signed
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml)
- [ ] **Documentation updated:** If checked, please file a pull request
on [our docs
repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys)
and link it here: #xxx
## Detailed Description of the Pull Request / Additional comments
## Validation Steps Performed
---
.../BookmarkManagerTests.cs | 44 +++++++++++++++++++
.../MockBookmarkDataSource.cs | 24 ++++++++++
.../BookmarksManager.cs | 28 +++++++++++-
.../Persistence/BookmarkData.cs | 2 +-
4 files changed, 96 insertions(+), 2 deletions(-)
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/BookmarkManagerTests.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/BookmarkManagerTests.cs
index 0751b5afe3..b4e533d66d 100644
--- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/BookmarkManagerTests.cs
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/BookmarkManagerTests.cs
@@ -186,4 +186,48 @@ public class BookmarkManagerTests
Assert.AreEqual("D:\\UpdatedPath", updatedBookmark.Bookmark);
Assert.IsTrue(bookmarkUpdatedEventFired);
}
+
+ [TestMethod]
+ public void BookmarkManager_LegacyData_IdsArePersistedAcrossLoads()
+ {
+ // Arrange
+ const string json = """
+ {
+ "Data":
+ [
+ { "Name": "C:\\","Bookmark": "C:\\" },
+ { "Name": "Bing.com","Bookmark": "https://bing.com" }
+ ]
+ }
+ """;
+
+ var dataSource = new MockBookmarkDataSource(json);
+
+ // First load: IDs should be generated for legacy entries
+ var manager1 = new BookmarksManager(dataSource);
+ var firstLoad = manager1.Bookmarks.ToList();
+ Assert.AreEqual(2, firstLoad.Count);
+ Assert.AreNotEqual(Guid.Empty, firstLoad[0].Id);
+ Assert.AreNotEqual(Guid.Empty, firstLoad[1].Id);
+
+ // Keep a name->id map to be insensitive to ordering
+ var firstIdsByName = firstLoad.ToDictionary(b => b.Name, b => b.Id);
+
+ // Wait deterministically for async persistence to complete
+ var wasSaved = dataSource.WaitForSave(1, 5000);
+ Assert.IsTrue(wasSaved, "Data was not saved within the expected time.");
+
+ // Second load: should read back the same IDs from persisted data
+ var manager2 = new BookmarksManager(dataSource);
+ var secondLoad = manager2.Bookmarks.ToList();
+ Assert.AreEqual(2, secondLoad.Count);
+
+ var secondIdsByName = secondLoad.ToDictionary(b => b.Name, b => b.Id);
+
+ foreach (var kvp in firstIdsByName)
+ {
+ Assert.IsTrue(secondIdsByName.ContainsKey(kvp.Key), $"Missing bookmark '{kvp.Key}' after reload.");
+ Assert.AreEqual(kvp.Value, secondIdsByName[kvp.Key], $"Bookmark '{kvp.Key}' upgraded ID was not persisted across loads.");
+ }
+ }
}
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/MockBookmarkDataSource.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/MockBookmarkDataSource.cs
index 3980ac13c6..02d71d6d77 100644
--- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/MockBookmarkDataSource.cs
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/MockBookmarkDataSource.cs
@@ -2,6 +2,8 @@
// The Microsoft Corporation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
+using System;
+using System.Threading;
using Microsoft.CmdPal.Ext.Bookmarks.Persistence;
namespace Microsoft.CmdPal.Ext.Bookmarks.UnitTests;
@@ -9,6 +11,7 @@ namespace Microsoft.CmdPal.Ext.Bookmarks.UnitTests;
internal sealed class MockBookmarkDataSource : IBookmarkDataSource
{
private string _jsonData;
+ private int _saveCount;
public MockBookmarkDataSource(string initialJsonData = "[]")
{
@@ -23,5 +26,26 @@ internal sealed class MockBookmarkDataSource : IBookmarkDataSource
public void SaveBookmarkData(string jsonData)
{
_jsonData = jsonData;
+ Interlocked.Increment(ref _saveCount);
+ }
+
+ public int SaveCount => Volatile.Read(ref _saveCount);
+
+ // Waits until at least expectedMinSaves have occurred or the timeout elapses.
+ // Returns true if the condition was met, false on timeout.
+ public bool WaitForSave(int expectedMinSaves = 1, int timeoutMs = 2000)
+ {
+ var start = Environment.TickCount;
+ while (Volatile.Read(ref _saveCount) < expectedMinSaves)
+ {
+ if (Environment.TickCount - start > timeoutMs)
+ {
+ return false;
+ }
+
+ Thread.Sleep(50);
+ }
+
+ return true;
}
}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/BookmarksManager.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/BookmarksManager.cs
index 1eb57fb7eb..fde574360f 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/BookmarksManager.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/BookmarksManager.cs
@@ -103,7 +103,33 @@ internal sealed partial class BookmarksManager : IDisposable, IBookmarksManager
try
{
var jsonData = _dataSource.GetBookmarkData();
- _bookmarksData = _parser.ParseBookmarks(jsonData);
+ var bookmarksData = _parser.ParseBookmarks(jsonData);
+
+ // Upgrade old bookmarks if necessary
+ // Pre .95 versions did not assign IDs to bookmarks
+ var upgraded = false;
+ for (var index = 0; index < bookmarksData.Data.Count; index++)
+ {
+ var bookmark = bookmarksData.Data[index];
+ if (bookmark.Id == Guid.Empty)
+ {
+ bookmarksData.Data[index] = bookmark with { Id = Guid.NewGuid() };
+ upgraded = true;
+ }
+ }
+
+ lock (_lock)
+ {
+ _bookmarksData = bookmarksData;
+ }
+
+ // LOAD BEARING: Save upgraded data back to file
+ // This ensures that old bookmarks are not repeatedly upgraded on each load,
+ // as the hotkeys and aliases are tied to the generated bookmark IDs.
+ if (upgraded)
+ {
+ _ = SaveChangesAsync();
+ }
}
catch (Exception ex)
{
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Persistence/BookmarkData.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Persistence/BookmarkData.cs
index 3129e1b578..b577f9cb35 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Persistence/BookmarkData.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Persistence/BookmarkData.cs
@@ -19,7 +19,7 @@ public sealed record BookmarkData
[SetsRequiredMembers]
public BookmarkData(Guid id, string? name, string? bookmark)
{
- Id = id == Guid.Empty ? Guid.NewGuid() : id;
+ Id = id;
Name = name ?? string.Empty;
Bookmark = bookmark ?? string.Empty;
}
From a69f7fa806539e0de6e9e901b4f651c512fdd54f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Pol=C3=A1=C5=A1ek?=
Date: Thu, 23 Oct 2025 23:57:12 +0200
Subject: [PATCH 07/59] CmdPal: Update top-level item view model to reflect
change of the associated command (#42806)
## Summary of the Pull Request
This PR implements a fix that ensures the top-level command's alias,
hotkey, and tags are automatically updated whenever the associated
command is modified, as the command defines the actual identity of the
item.
## PR Checklist
- [x] Closes: #42796
- [x] Related to: #42807
- [ ] **Communication:** I've discussed this with core contributors
already. If the work hasn't been agreed, this work might be rejected
- [ ] **Tests:** Added/updated and all pass
- [ ] **Localization:** All end-user-facing strings can be localized
- [ ] **Dev docs:** Added/updated
- [ ] **New binaries:** Added on the required places
- [ ] [JSON for
signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json)
for new binaries
- [ ] [WXS for
installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs)
for new binaries and localization folder
- [ ] [YML for CI
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml)
for new test projects
- [ ] [YML for signed
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml)
- [ ] **Documentation updated:** If checked, please file a pull request
on [our docs
repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys)
and link it here: #xxx
## Detailed Description of the Pull Request / Additional comments
## Validation Steps Performed
---
.../cmdpal/Microsoft.CmdPal.UI.ViewModels/TopLevelViewModel.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/TopLevelViewModel.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/TopLevelViewModel.cs
index 9d05e8019f..fc5e36d1e2 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/TopLevelViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/TopLevelViewModel.cs
@@ -219,7 +219,7 @@ public sealed partial class TopLevelViewModel : ObservableObject, IListItem
{
PropChanged?.Invoke(this, new PropChangedEventArgs(e.PropertyName));
- if (e.PropertyName == "IsInitialized")
+ if (e.PropertyName is "IsInitialized" or nameof(CommandItemViewModel.Command))
{
GenerateId();
From c71fdca277c971434a4e283fb357806ed1b102cd Mon Sep 17 00:00:00 2001
From: Kai Tao <69313318+vanzue@users.noreply.github.com>
Date: Fri, 24 Oct 2025 10:24:39 +0800
Subject: [PATCH 08/59] Hybrid CRT for powertys (#42073)
## Summary of the Pull Request
Hybrid CRT across powertoys for better bundle size
## PR Checklist
- [ ] Closes: #xxx
- [ ] **Communication:** I've discussed this with core contributors
already. If the work hasn't been agreed, this work might be rejected
- [ ] **Tests:** Added/updated and all pass
- [ ] **Localization:** All end-user-facing strings can be localized
- [ ] **Dev docs:** Added/updated
- [ ] **New binaries:** Added on the required places
- [ ] [JSON for
signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json)
for new binaries
- [ ] [WXS for
installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs)
for new binaries and localization folder
- [ ] [YML for CI
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml)
for new test projects
- [ ] [YML for signed
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml)
- [ ] **Documentation updated:** If checked, please file a pull request
on [our docs
repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys)
and link it here: #xxx
## Detailed Description of the Pull Request / Additional comments
## Validation Steps Performed
Bundle Size comparasion:
| bundle | Before Hybrid CRT | After Hybrid CRT | diff |
|---------------|-------------------|------------------|------|
| x64-user | 317M | 310M | 7M |
| x64-machine | 317M |310M | 7M |
| arm64-user | 305M | 299M | 6M |
| arm64-machine | 305M | 299M | 6M |
Did verification on a sandbox machine, every module launches as
expected, no dependency issue
---
Cpp.Build.props | 52 +++++++++++++++++-
.../PowerToysSetupCustomActionsVNext.vcxproj | 3 -
.../PowerToysSetupVNext/Directory.Build.props | 3 +-
.../SilentFilesInUseBAFunction.vcxproj | 55 ++-----------------
.../SilentFilesInUseBAFunctions.cpp | 8 +--
.../CalculatorEngineCommon.vcxproj | 50 +----------------
src/common/interop/PowerToys.Interop.vcxproj | 2 -
.../BackgroundActivator.vcxproj | 10 ----
.../CropAndLock/CropAndLock.vcxproj | 4 --
.../FileLocksmithLibInterop.vcxproj | 2 -
.../FindMyMouse/FindMyMouse.vcxproj | 2 -
.../MouseHighlighter/MouseHighlighter.vcxproj | 2 -
.../MouseUtils/MouseJump/MouseJump.vcxproj | 2 -
.../MousePointerCrosshairs.vcxproj | 2 -
.../NewShellExtensionContextMenu.vcxproj | 4 --
.../WorkspacesLauncher.vcxproj | 2 -
.../WorkspacesSnapshotTool.vcxproj | 2 -
.../WorkspacesWindowArranger.vcxproj | 2 -
src/modules/ZoomIt/ZoomIt/ZoomIt.vcxproj | 6 --
.../AlwaysOnTop/AlwaysOnTop.vcxproj | 2 -
.../CmdPalKeyboardService.vcxproj | 39 -------------
.../Microsoft.Terminal.UI.vcxproj | 24 --------
...icrosoft.CommandPalette.Extensions.vcxproj | 28 ----------
.../fancyzones/FancyZones/FancyZones.vcxproj | 2 -
.../KeyboardManagerEditor.vcxproj | 2 -
.../PowerRename.FuzzingTest.vcxproj | 1 -
.../ModuleTemplate/ModuleTemplate.vcxproj | 2 -
.../ModuleTemplateCompileTest.vcxproj | 2 -
28 files changed, 59 insertions(+), 256 deletions(-)
diff --git a/Cpp.Build.props b/Cpp.Build.props
index 5a4538f940..99738fd0dc 100644
--- a/Cpp.Build.props
+++ b/Cpp.Build.props
@@ -1,6 +1,56 @@
+
+
+ $(Configuration)
+
+
+
+
+
+
+
+
+
+ MultiThreadedDebug
+
+
+
+ %(IgnoreSpecificDefaultLibraries);libucrtd.lib
+ %(AdditionalOptions) /defaultlib:ucrtd.lib
+
+
+
+
+
+ MultiThreaded
+
+
+
+ %(IgnoreSpecificDefaultLibraries);libucrt.lib
+ %(AdditionalOptions) /defaultlib:ucrt.lib
+
+
+
+
+
+
+ MultiThreadedDebugDLL
+
+
+
+
+ MultiThreadedDLL
+
+
@@ -73,7 +123,6 @@
_DEBUG;%(PreprocessorDefinitions)
Disabled
- MultiThreadedDebug
true
@@ -83,7 +132,6 @@
NDEBUG;%(PreprocessorDefinitions)
MaxSpeed
- MultiThreaded
true
true
diff --git a/installer/PowerToysSetupCustomActionsVNext/PowerToysSetupCustomActionsVNext.vcxproj b/installer/PowerToysSetupCustomActionsVNext/PowerToysSetupCustomActionsVNext.vcxproj
index 7cd49be6ea..3dca775d92 100644
--- a/installer/PowerToysSetupCustomActionsVNext/PowerToysSetupCustomActionsVNext.vcxproj
+++ b/installer/PowerToysSetupCustomActionsVNext/PowerToysSetupCustomActionsVNext.vcxproj
@@ -38,7 +38,6 @@
$(Platform)\$(Configuration)\UserSetup\
$(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\MachineSetup\obj\
$(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\UserSetup\obj\
-
false
true
@@ -115,7 +114,6 @@
Disabled
_DEBUG;_WINDOWS;_USRDLL;CUSTOMACTIONTEST_EXPORTS;%(PreprocessorDefinitions)
EnableFastChecks
- MultiThreadedDebug
true
@@ -128,7 +126,6 @@
MaxSpeed
true
NDEBUG;_WINDOWS;_USRDLL;CUSTOMACTIONTEST_EXPORTS;%(PreprocessorDefinitions)
- MultiThreaded
true
diff --git a/installer/PowerToysSetupVNext/Directory.Build.props b/installer/PowerToysSetupVNext/Directory.Build.props
index 505e3cf844..69a63832d1 100644
--- a/installer/PowerToysSetupVNext/Directory.Build.props
+++ b/installer/PowerToysSetupVNext/Directory.Build.props
@@ -1,4 +1,5 @@
+
@@ -8,4 +9,4 @@
$(BaseIntermediateOutputPath)
-
+
\ No newline at end of file
diff --git a/installer/PowerToysSetupVNext/SilentFilesInUseBA/SilentFilesInUseBAFunction.vcxproj b/installer/PowerToysSetupVNext/SilentFilesInUseBA/SilentFilesInUseBAFunction.vcxproj
index 3972c1b0f7..d45e32f87c 100644
--- a/installer/PowerToysSetupVNext/SilentFilesInUseBA/SilentFilesInUseBAFunction.vcxproj
+++ b/installer/PowerToysSetupVNext/SilentFilesInUseBA/SilentFilesInUseBAFunction.vcxproj
@@ -1,30 +1,7 @@
-
-
-
-
- Debug
- ARM64
-
-
- Release
- ARM64
-
-
- Debug
- x64
-
-
- Release
- x64
-
-
-
{F8B9F842-F5C3-4A2D-8C85-7F8B9E2B4F1D}
- DynamicLibrary
- Unicode
SilentFilesInUseBAFunction
PowerToysSetupCustomActionsVNext
bafunctions.def
@@ -33,7 +10,6 @@
DynamicLibrary
true
@@ -65,7 +41,10 @@
-
+ Use
+ precomp.h
+
Create
precomp.h
@@ -92,31 +71,5 @@
-
-
-
- _DEBUG;%(PreprocessorDefinitions)
- Disabled
- MultiThreadedDebug
-
-
- true
-
-
-
-
- NDEBUG;%(PreprocessorDefinitions)
- MaxSpeed
- MultiThreaded
- true
- true
-
-
- true
- true
- true
-
-
-
diff --git a/installer/PowerToysSetupVNext/SilentFilesInUseBA/SilentFilesInUseBAFunctions.cpp b/installer/PowerToysSetupVNext/SilentFilesInUseBA/SilentFilesInUseBAFunctions.cpp
index 9b9e5d570f..ceccde5f0d 100644
--- a/installer/PowerToysSetupVNext/SilentFilesInUseBA/SilentFilesInUseBAFunctions.cpp
+++ b/installer/PowerToysSetupVNext/SilentFilesInUseBA/SilentFilesInUseBAFunctions.cpp
@@ -18,7 +18,6 @@ public: // IBootstrapperApplication
BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "*** CUSTOM BA FUNCTION SYSTEM ACTIVE *** Running detect begin BA function. fCached=%d, registrationType=%d, cPackages=%u, fCancel=%d", fCached, registrationType, cPackages, *pfCancel);
- LExit:
return hr;
}
@@ -32,12 +31,6 @@ public: // IBAFunctions
BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "*** CUSTOM BA FUNCTION SYSTEM ACTIVE *** Running plan begin BA function. cPackages=%u, fCancel=%d", cPackages, *pfCancel);
- //-------------------------------------------------------------------------------------------------
- // YOUR CODE GOES HERE
- // BalExitOnFailure(hr, "Change this message to represent real error handling.");
- //-------------------------------------------------------------------------------------------------
-
- LExit:
return hr;
}
@@ -63,6 +56,7 @@ public: // IBAFunctions
)
{
HRESULT hr = S_OK;
+ UNREFERENCED_PARAMETER(source);
BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "*** CUSTOM BA FUNCTION CALLED *** Running OnExecuteFilesInUse BA function. packageId=%ls, cFiles=%u, recommendation=%d", wzPackageId, cFiles, nRecommendation);
diff --git a/src/common/CalculatorEngineCommon/CalculatorEngineCommon.vcxproj b/src/common/CalculatorEngineCommon/CalculatorEngineCommon.vcxproj
index 43f4749892..ff9332cfc0 100644
--- a/src/common/CalculatorEngineCommon/CalculatorEngineCommon.vcxproj
+++ b/src/common/CalculatorEngineCommon/CalculatorEngineCommon.vcxproj
@@ -9,12 +9,6 @@
CalculatorEngineCommon
false
-
-
- true
- false
-
-
true
@@ -25,11 +19,9 @@
true
- true
+ false
true
Windows Store
- false
-
@@ -148,43 +140,5 @@
-
-
- MultiThreadedDebug
- stdcpp17
-
-
-
- %(IgnoreSpecificDefaultLibraries);libucrtd.lib
- %(AdditionalOptions) /defaultlib:ucrtd.lib
-
-
-
-
-
- MultiThreaded
-
-
-
- %(IgnoreSpecificDefaultLibraries);libucrt.lib
- %(AdditionalOptions) /defaultlib:ucrt.lib
-
-
-
+
\ No newline at end of file
diff --git a/src/common/interop/PowerToys.Interop.vcxproj b/src/common/interop/PowerToys.Interop.vcxproj
index ca29e69cce..472119925e 100644
--- a/src/common/interop/PowerToys.Interop.vcxproj
+++ b/src/common/interop/PowerToys.Interop.vcxproj
@@ -63,14 +63,12 @@
- MultiThreadedDebug
true
true
- MultiThreaded
false
true
false
diff --git a/src/common/notifications/BackgroundActivator/BackgroundActivator.vcxproj b/src/common/notifications/BackgroundActivator/BackgroundActivator.vcxproj
index 077333a664..b2ebc7cb72 100644
--- a/src/common/notifications/BackgroundActivator/BackgroundActivator.vcxproj
+++ b/src/common/notifications/BackgroundActivator/BackgroundActivator.vcxproj
@@ -46,16 +46,6 @@
notifications
-
-
- MultiThreadedDebugDLL
-
-
-
-
- MultiThreadedDLL
-
-
$(IntDir)pch.pch
diff --git a/src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj b/src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj
index c3e9e4f3f1..71b535c629 100644
--- a/src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj
+++ b/src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj
@@ -82,8 +82,6 @@
Disabled
_DEBUG;%(PreprocessorDefinitions)
- MultiThreadedDebug
- MultiThreadedDebug
false
@@ -95,8 +93,6 @@
true
true
NDEBUG;%(PreprocessorDefinitions)
- MultiThreaded
- MultiThreaded
true
diff --git a/src/modules/FileLocksmith/FileLocksmithLibInterop/FileLocksmithLibInterop.vcxproj b/src/modules/FileLocksmith/FileLocksmithLibInterop/FileLocksmithLibInterop.vcxproj
index c4489cdad8..184eec3342 100644
--- a/src/modules/FileLocksmith/FileLocksmithLibInterop/FileLocksmithLibInterop.vcxproj
+++ b/src/modules/FileLocksmith/FileLocksmithLibInterop/FileLocksmithLibInterop.vcxproj
@@ -39,7 +39,6 @@
_DEBUG;%(PreprocessorDefinitions)
- MultiThreadedDebugDLL
true
true
@@ -49,7 +48,6 @@
NDEBUG;%(PreprocessorDefinitions)
true
true
- MultiThreadedDLL
false
true
false
diff --git a/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj b/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj
index d127de245e..0f444134ec 100644
--- a/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj
+++ b/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj
@@ -64,7 +64,6 @@
true
_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
true
- MultiThreadedDebug
stdcpplatest
@@ -82,7 +81,6 @@
true
NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
true
- MultiThreaded
stdcpplatest
diff --git a/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj b/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj
index df0df021da..ecd6ea3ec4 100644
--- a/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj
+++ b/src/modules/MouseUtils/MouseHighlighter/MouseHighlighter.vcxproj
@@ -48,7 +48,6 @@
true
_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
true
- MultiThreadedDebug
stdcpplatest
@@ -66,7 +65,6 @@
true
NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
true
- MultiThreaded
stdcpplatest
diff --git a/src/modules/MouseUtils/MouseJump/MouseJump.vcxproj b/src/modules/MouseUtils/MouseJump/MouseJump.vcxproj
index 29e8f444bf..89abed873a 100644
--- a/src/modules/MouseUtils/MouseJump/MouseJump.vcxproj
+++ b/src/modules/MouseUtils/MouseJump/MouseJump.vcxproj
@@ -48,7 +48,6 @@
true
_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
true
- MultiThreadedDebug
stdcpplatest
@@ -66,7 +65,6 @@
true
NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
true
- MultiThreaded
stdcpplatest
diff --git a/src/modules/MouseUtils/MousePointerCrosshairs/MousePointerCrosshairs.vcxproj b/src/modules/MouseUtils/MousePointerCrosshairs/MousePointerCrosshairs.vcxproj
index 58668c663f..7fef06e960 100644
--- a/src/modules/MouseUtils/MousePointerCrosshairs/MousePointerCrosshairs.vcxproj
+++ b/src/modules/MouseUtils/MousePointerCrosshairs/MousePointerCrosshairs.vcxproj
@@ -49,7 +49,6 @@
true
_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
true
- MultiThreadedDebug
stdcpplatest
@@ -67,7 +66,6 @@
true
NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
true
- MultiThreaded
stdcpplatest
diff --git a/src/modules/NewPlus/NewShellExtensionContextMenu/NewShellExtensionContextMenu.vcxproj b/src/modules/NewPlus/NewShellExtensionContextMenu/NewShellExtensionContextMenu.vcxproj
index 90058a503e..6685afafc2 100644
--- a/src/modules/NewPlus/NewShellExtensionContextMenu/NewShellExtensionContextMenu.vcxproj
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/NewShellExtensionContextMenu.vcxproj
@@ -67,8 +67,6 @@
false
dll.def
runtimeobject.lib;$(CoreLibraryDependencies)
-
-
del $(OutDir)\NewPlusPackage.msix /q
@@ -100,8 +98,6 @@ MakeAppx.exe pack /d . /p $(OutDir)NewPlusPackage.msix /nv
false
dll.def
runtimeobject.lib;$(CoreLibraryDependencies)
-
-
del $(OutDir)\NewPlusPackage.msix /q
diff --git a/src/modules/Workspaces/WorkspacesLauncher/WorkspacesLauncher.vcxproj b/src/modules/Workspaces/WorkspacesLauncher/WorkspacesLauncher.vcxproj
index 9d4fc4bcab..7be5219a9f 100644
--- a/src/modules/Workspaces/WorkspacesLauncher/WorkspacesLauncher.vcxproj
+++ b/src/modules/Workspaces/WorkspacesLauncher/WorkspacesLauncher.vcxproj
@@ -29,7 +29,6 @@
_DEBUG;%(PreprocessorDefinitions)
Disabled
true
- MultiThreadedDebug
true
@@ -40,7 +39,6 @@
NDEBUG;%(PreprocessorDefinitions)
MaxSpeed
false
- MultiThreaded
true
true
diff --git a/src/modules/Workspaces/WorkspacesSnapshotTool/WorkspacesSnapshotTool.vcxproj b/src/modules/Workspaces/WorkspacesSnapshotTool/WorkspacesSnapshotTool.vcxproj
index 05e4241c1c..ad7a96ec84 100644
--- a/src/modules/Workspaces/WorkspacesSnapshotTool/WorkspacesSnapshotTool.vcxproj
+++ b/src/modules/Workspaces/WorkspacesSnapshotTool/WorkspacesSnapshotTool.vcxproj
@@ -29,7 +29,6 @@
_DEBUG;%(PreprocessorDefinitions)
Disabled
true
- MultiThreadedDebug
true
@@ -40,7 +39,6 @@
NDEBUG;%(PreprocessorDefinitions)
MaxSpeed
false
- MultiThreaded
true
true
diff --git a/src/modules/Workspaces/WorkspacesWindowArranger/WorkspacesWindowArranger.vcxproj b/src/modules/Workspaces/WorkspacesWindowArranger/WorkspacesWindowArranger.vcxproj
index 2451be2470..4555f6257b 100644
--- a/src/modules/Workspaces/WorkspacesWindowArranger/WorkspacesWindowArranger.vcxproj
+++ b/src/modules/Workspaces/WorkspacesWindowArranger/WorkspacesWindowArranger.vcxproj
@@ -29,7 +29,6 @@
_DEBUG;%(PreprocessorDefinitions)
Disabled
true
- MultiThreadedDebug
true
@@ -40,7 +39,6 @@
NDEBUG;%(PreprocessorDefinitions)
MaxSpeed
false
- MultiThreaded
true
true
diff --git a/src/modules/ZoomIt/ZoomIt/ZoomIt.vcxproj b/src/modules/ZoomIt/ZoomIt/ZoomIt.vcxproj
index d054d2b4bd..f12898dbd4 100644
--- a/src/modules/ZoomIt/ZoomIt/ZoomIt.vcxproj
+++ b/src/modules/ZoomIt/ZoomIt/ZoomIt.vcxproj
@@ -81,7 +81,6 @@
MaxSpeed
__ZOOMIT_POWERTOYS__;_UNICODE;UNICODE;WINVER=0x602;NDEBUG;_WIN32_WINNT=0x602;_WIN32_WINDOWS=0x501;WIN32;_WINDOWS;MSVC6=1;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
true
- MultiThreaded
true
@@ -103,7 +102,6 @@
MaxSpeed
__ZOOMIT_POWERTOYS__;_UNICODE;UNICODE;WINVER=0x602;NDEBUG;_WIN32_WINNT=0x602;_WIN32_WINDOWS=0x501;WIN32;_WINDOWS;MSVC6=1;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
true
- MultiThreaded
true
@@ -126,7 +124,6 @@
MaxSpeed
__ZOOMIT_POWERTOYS__;_UNICODE;UNICODE;WINVER=0x602;NDEBUG;_WIN32_WINNT=0x602;_WIN32_WINDOWS=0x501;WIN32;_WINDOWS;MSVC6=1;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
true
- MultiThreaded
true
@@ -148,7 +145,6 @@
Disabled
__ZOOMIT_POWERTOYS__;_UNICODE;UNICODE;WINVER=0x0602;_DEBUG;_WIN32_WINNT=0x602.MSVC6;_WIN32_WINDOWS=0x600;WIN32;_WINDOWS;_WIN32_WINNT=0x602;MSVC6=1;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
EnableFastChecks
- MultiThreadedDebug
_DEBUG;_M_IX86;%(PreprocessorDefinitions)
@@ -169,7 +165,6 @@
Disabled
__ZOOMIT_POWERTOYS__;_UNICODE;UNICODE;WINVER=0x0602;_DEBUG;_WIN32_WINNT=0x602.MSVC6;_WIN32_WINDOWS=0x600;WIN32;_WINDOWS;_WIN32_WINNT=0x602;MSVC6=1;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
EnableFastChecks
- MultiThreadedDebug
_DEBUG;_M_X64;%(PreprocessorDefinitions)
@@ -191,7 +186,6 @@
Disabled
__ZOOMIT_POWERTOYS__;_UNICODE;UNICODE;WINVER=0x0602;_DEBUG;_WIN32_WINNT=0x602.MSVC6;_WIN32_WINDOWS=0x600;WIN32;_WINDOWS;_WIN32_WINNT=0x602;MSVC6=1;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
EnableFastChecks
- MultiThreadedDebug
_DEBUG;_M_ARM64;%(PreprocessorDefinitions)
diff --git a/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj b/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj
index bf3e5c6851..5adad25bac 100644
--- a/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj
+++ b/src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj
@@ -29,7 +29,6 @@
_DEBUG;%(PreprocessorDefinitions)
Disabled
true
- MultiThreadedDebug
true
@@ -40,7 +39,6 @@
NDEBUG;%(PreprocessorDefinitions)
MaxSpeed
false
- MultiThreaded
true
true
diff --git a/src/modules/cmdpal/CmdPalKeyboardService/CmdPalKeyboardService.vcxproj b/src/modules/cmdpal/CmdPalKeyboardService/CmdPalKeyboardService.vcxproj
index f891ce96e6..4e20f55383 100644
--- a/src/modules/cmdpal/CmdPalKeyboardService/CmdPalKeyboardService.vcxproj
+++ b/src/modules/cmdpal/CmdPalKeyboardService/CmdPalKeyboardService.vcxproj
@@ -141,43 +141,4 @@
-
-
- MultiThreadedDebug
-
-
-
- %(IgnoreSpecificDefaultLibraries);libucrtd.lib
- %(AdditionalOptions) /defaultlib:ucrtd.lib
-
-
-
-
-
- MultiThreaded
-
-
-
- %(IgnoreSpecificDefaultLibraries);libucrt.lib
- %(AdditionalOptions) /defaultlib:ucrt.lib
-
-
-
-
\ No newline at end of file
diff --git a/src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj b/src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj
index 6e474cf5f3..347b5a1bc6 100644
--- a/src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj
+++ b/src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj
@@ -74,35 +74,11 @@
stdcpp20
-
-
- MultiThreadedDebug
-
-
-
- %(IgnoreSpecificDefaultLibraries);libucrtd.lib
- %(AdditionalOptions) /defaultlib:ucrtd.lib /profile /opt:ref /opt:icf
-
stdcpp20
-
-
- MultiThreaded
-
-
-
- %(IgnoreSpecificDefaultLibraries);libucrt.lib
- %(AdditionalOptions) /defaultlib:ucrt.lib /profile /opt:ref /opt:icf
-
diff --git a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/Microsoft.CommandPalette.Extensions.vcxproj b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/Microsoft.CommandPalette.Extensions.vcxproj
index a6cad871ab..92baf3dfa6 100644
--- a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/Microsoft.CommandPalette.Extensions.vcxproj
+++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/Microsoft.CommandPalette.Extensions.vcxproj
@@ -68,34 +68,6 @@
true
false
-
-
-
- MultiThreadedDebug
-
-
-
- %(IgnoreSpecificDefaultLibraries);libucrtd.lib
- %(AdditionalOptions) /defaultlib:ucrtd.lib /profile /opt:ref /opt:icf
-
-
-
-
-
- MultiThreaded
-
-
-
- %(IgnoreSpecificDefaultLibraries);libucrt.lib
- %(AdditionalOptions) /defaultlib:ucrt.lib /profile /opt:ref /opt:icf
-
-
diff --git a/src/modules/fancyzones/FancyZones/FancyZones.vcxproj b/src/modules/fancyzones/FancyZones/FancyZones.vcxproj
index b54ee19e34..7aab504830 100644
--- a/src/modules/fancyzones/FancyZones/FancyZones.vcxproj
+++ b/src/modules/fancyzones/FancyZones/FancyZones.vcxproj
@@ -26,7 +26,6 @@
_DEBUG;%(PreprocessorDefinitions)
Disabled
true
- MultiThreadedDebug
true
@@ -37,7 +36,6 @@
NDEBUG;%(PreprocessorDefinitions)
MaxSpeed
false
- MultiThreaded
true
true
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditor/KeyboardManagerEditor.vcxproj b/src/modules/keyboardmanager/KeyboardManagerEditor/KeyboardManagerEditor.vcxproj
index 3c124d63e4..8a4fa95889 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditor/KeyboardManagerEditor.vcxproj
+++ b/src/modules/keyboardmanager/KeyboardManagerEditor/KeyboardManagerEditor.vcxproj
@@ -30,7 +30,6 @@
_DEBUG;%(PreprocessorDefinitions)
Disabled
true
- MultiThreadedDebug
true
@@ -41,7 +40,6 @@
NDEBUG;%(PreprocessorDefinitions)
MaxSpeed
false
- MultiThreaded
true
true
diff --git a/src/modules/powerrename/PowerRename.FuzzingTest/PowerRename.FuzzingTest.vcxproj b/src/modules/powerrename/PowerRename.FuzzingTest/PowerRename.FuzzingTest.vcxproj
index f9e245559c..1a7ca91972 100644
--- a/src/modules/powerrename/PowerRename.FuzzingTest/PowerRename.FuzzingTest.vcxproj
+++ b/src/modules/powerrename/PowerRename.FuzzingTest/PowerRename.FuzzingTest.vcxproj
@@ -44,7 +44,6 @@
true
NotUsing
/fsanitize=address /fsanitize-coverage=inline-8bit-counters /fsanitize-coverage=edge /fsanitize-coverage=trace-cmp /fsanitize-coverage=trace-div %(AdditionalOptions)
- MultiThreaded
stdcpplatest
..\;..\lib\;..\..\..\;%(AdditionalIncludeDirectories)
diff --git a/tools/project_template/ModuleTemplate/ModuleTemplate.vcxproj b/tools/project_template/ModuleTemplate/ModuleTemplate.vcxproj
index 028007de67..39c656a6cc 100644
--- a/tools/project_template/ModuleTemplate/ModuleTemplate.vcxproj
+++ b/tools/project_template/ModuleTemplate/ModuleTemplate.vcxproj
@@ -46,7 +46,6 @@
true
_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
true
- MultiThreadedDebug
stdcpplatest
@@ -64,7 +63,6 @@
true
NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
true
- MultiThreaded
stdcpplatest
diff --git a/tools/project_template/ModuleTemplate/ModuleTemplateCompileTest.vcxproj b/tools/project_template/ModuleTemplate/ModuleTemplateCompileTest.vcxproj
index 297516b0d5..a1ef0522aa 100644
--- a/tools/project_template/ModuleTemplate/ModuleTemplateCompileTest.vcxproj
+++ b/tools/project_template/ModuleTemplate/ModuleTemplateCompileTest.vcxproj
@@ -47,7 +47,6 @@
Disabled
true
_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- MultiThreadedDebug
stdcpplatest
@@ -64,7 +63,6 @@
true
true
NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- MultiThreaded
stdcpplatest
From 82dc4cdc184b2cea7faec9093e354a0b161dfa1b Mon Sep 17 00:00:00 2001
From: moooyo <42196638+moooyo@users.noreply.github.com>
Date: Sat, 25 Oct 2025 03:28:30 +0800
Subject: [PATCH 09/59] [CmdPal] Replace complex cancellation token mechanism
with a simple task queue. (#42356)
## Summary of the Pull Request
Just consider user are trying to search a long name such as "Visual
Studio Code"
The old mechanism:
User input: V
Task: V
Then input: i
Task cancel for V and start task i
etc...
The problem is:
1. I don't think we can really cancel the most time-cost part (Find
packages from WinGet).
2. User cannot see anything before they really end the input and the
last task complete. UX exp is so bad.
3. It's so complex to maintain. Hard to understand for the new
contributor.
New mechanism:
User input: V
Task: V
Then input: i
Prev Task is still running but mark the next task is i
Input: s
Prev Task is still running but override the next task to s
etc...
We can get:
1. User can see some results if prev task complete.
2. It's simple to understand
3. The extra time cost I think will not too much. Because we ignored the
middle input.
Compare:
https://github.com/user-attachments/assets/f45f4073-efab-4f43-87f0-f47b727f36dc
## PR Checklist
- [ ] Closes: #xxx
- [ ] **Communication:** I've discussed this with core contributors
already. If the work hasn't been agreed, this work might be rejected
- [ ] **Tests:** Added/updated and all pass
- [ ] **Localization:** All end-user-facing strings can be localized
- [ ] **Dev docs:** Added/updated
- [ ] **New binaries:** Added on the required places
- [ ] [JSON for
signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json)
for new binaries
- [ ] [WXS for
installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs)
for new binaries and localization folder
- [ ] [YML for CI
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml)
for new test projects
- [ ] [YML for signed
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml)
- [ ] **Documentation updated:** If checked, please file a pull request
on [our docs
repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys)
and link it here: #xxx
## Detailed Description of the Pull Request / Additional comments
## Validation Steps Performed
Co-authored-by: Yu Leng
---
.../Pages/WinGetExtensionPage.cs | 136 +++++++++---------
1 file changed, 64 insertions(+), 72 deletions(-)
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/Pages/WinGetExtensionPage.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/Pages/WinGetExtensionPage.cs
index 1d7758769a..e84802b8fa 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/Pages/WinGetExtensionPage.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/Pages/WinGetExtensionPage.cs
@@ -28,9 +28,10 @@ internal sealed partial class WinGetExtensionPage : DynamicListPage, IDisposable
public bool HasTag => !string.IsNullOrEmpty(_tag);
private readonly Lock _resultsLock = new();
+ private readonly Lock _taskLock = new();
- private CancellationTokenSource? _cancellationTokenSource;
- private Task>? _currentSearchTask;
+ private string? _nextSearchQuery;
+ private bool _isTaskRunning;
private List? _results;
@@ -85,7 +86,6 @@ internal sealed partial class WinGetExtensionPage : DynamicListPage, IDisposable
stopwatch.Stop();
Logger.LogDebug($"Building ListItems took {stopwatch.ElapsedMilliseconds}ms", memberName: nameof(GetItems));
- IsLoading = false;
return results;
}
}
@@ -98,8 +98,6 @@ internal sealed partial class WinGetExtensionPage : DynamicListPage, IDisposable
Properties.Resources.winget_no_packages_found,
};
- IsLoading = false;
-
return [];
}
@@ -117,64 +115,70 @@ internal sealed partial class WinGetExtensionPage : DynamicListPage, IDisposable
private void DoUpdateSearchText(string newSearch)
{
- // Cancel any ongoing search
- if (_cancellationTokenSource is not null)
+ lock (_taskLock)
{
- Logger.LogDebug("Cancelling old search", memberName: nameof(DoUpdateSearchText));
- _cancellationTokenSource.Cancel();
- }
-
- _cancellationTokenSource = new CancellationTokenSource();
-
- var cancellationToken = _cancellationTokenSource.Token;
-
- IsLoading = true;
-
- try
- {
- // Save the latest search task
- _currentSearchTask = DoSearchAsync(newSearch, cancellationToken);
- }
- catch (OperationCanceledException)
- {
- // DO NOTHING HERE
- return;
- }
- catch (Exception ex)
- {
- // Handle other exceptions
- ExtensionHost.LogMessage($"[WinGet] DoUpdateSearchText throw exception: {ex.Message}");
- return;
- }
-
- // Await the task to ensure only the latest one gets processed
- _ = ProcessSearchResultsAsync(_currentSearchTask, newSearch);
- }
-
- private async Task ProcessSearchResultsAsync(
- Task> searchTask,
- string newSearch)
- {
- try
- {
- var results = await searchTask;
-
- // Ensure this is still the latest task
- if (_currentSearchTask == searchTask)
+ if (_isTaskRunning)
{
- // Process the results (e.g., update UI)
- UpdateWithResults(results, newSearch);
+ // If a task is running, queue the next search query
+ // Keep IsLoading = true since we still have work to do
+ Logger.LogDebug($"Task is running, queueing next search: '{newSearch}'", memberName: nameof(DoUpdateSearchText));
+ _nextSearchQuery = newSearch;
+ }
+ else
+ {
+ // No task is running, start a new search
+ Logger.LogDebug($"Starting new search: '{newSearch}'", memberName: nameof(DoUpdateSearchText));
+ _isTaskRunning = true;
+ _nextSearchQuery = null;
+ IsLoading = true;
+
+ _ = ExecuteSearchChainAsync(newSearch);
}
}
- catch (OperationCanceledException)
+ }
+
+ private async Task ExecuteSearchChainAsync(string query)
+ {
+ while (true)
{
- // Handle cancellation gracefully (e.g., log or ignore)
- Logger.LogDebug($" Cancelled search for '{newSearch}'");
- }
- catch (Exception ex)
- {
- // Handle other exceptions
- Logger.LogError("Unexpected error while processing results", ex);
+ try
+ {
+ Logger.LogDebug($"Executing search for '{query}'", memberName: nameof(ExecuteSearchChainAsync));
+
+ var results = await DoSearchAsync(query);
+
+ // Update UI with results
+ UpdateWithResults(results, query);
+ }
+ catch (Exception ex)
+ {
+ Logger.LogError($"Unexpected error while searching for '{query}'", ex);
+ }
+
+ // Check if there's a next query to process
+ string? nextQuery;
+ lock (_taskLock)
+ {
+ if (_nextSearchQuery is not null)
+ {
+ // There's a queued search, execute it
+ nextQuery = _nextSearchQuery;
+ _nextSearchQuery = null;
+
+ Logger.LogDebug($"Found queued search, continuing with: '{nextQuery}'", memberName: nameof(ExecuteSearchChainAsync));
+ }
+ else
+ {
+ // No more searches queued, mark task as completed
+ _isTaskRunning = false;
+ IsLoading = false;
+ Logger.LogDebug("No more queued searches, task chain completed", memberName: nameof(ExecuteSearchChainAsync));
+ break;
+ }
+ }
+
+ // Continue with the next query
+ query = nextQuery;
}
}
@@ -189,11 +193,8 @@ internal sealed partial class WinGetExtensionPage : DynamicListPage, IDisposable
RaiseItemsChanged();
}
- private async Task> DoSearchAsync(string query, CancellationToken ct)
+ private async Task> DoSearchAsync(string query)
{
- // Were we already canceled?
- ct.ThrowIfCancellationRequested();
-
Stopwatch stopwatch = new();
stopwatch.Start();
@@ -230,9 +231,6 @@ internal sealed partial class WinGetExtensionPage : DynamicListPage, IDisposable
opts.Filters.Add(tagFilter);
}
- // Clean up here, then...
- ct.ThrowIfCancellationRequested();
-
var catalogTask = HasTag ? WinGetStatics.CompositeWingetCatalog : WinGetStatics.CompositeAllCatalog;
// Both these catalogs should have been instantiated by the
@@ -251,13 +249,11 @@ internal sealed partial class WinGetExtensionPage : DynamicListPage, IDisposable
findPackages_stopwatch.Start();
Logger.LogDebug($" Searching {catalog.Info.Name} ({query})", memberName: nameof(DoSearchAsync));
- ct.ThrowIfCancellationRequested();
-
Logger.LogDebug($"Preface for \"{searchDebugText}\" took {stopwatch.ElapsedMilliseconds}ms", memberName: nameof(DoSearchAsync));
// BODGY, re: microsoft/winget-cli#5151
// FindPackagesAsync isn't actually async.
- var internalSearchTask = Task.Run(() => catalog.FindPackages(opts), ct);
+ var internalSearchTask = Task.Run(() => catalog.FindPackages(opts));
var searchResults = await internalSearchTask;
findPackages_stopwatch.Stop();
@@ -271,8 +267,6 @@ internal sealed partial class WinGetExtensionPage : DynamicListPage, IDisposable
return [];
}
- ct.ThrowIfCancellationRequested();
-
Logger.LogDebug($" got results for ({query})", memberName: nameof(DoSearchAsync));
// FYI Using .ToArray or any other kind of enumerable loop
@@ -282,8 +276,6 @@ internal sealed partial class WinGetExtensionPage : DynamicListPage, IDisposable
{
var match = searchResults.Matches[i];
- ct.ThrowIfCancellationRequested();
-
var package = match.CatalogPackage;
results.Add(package);
}
From 0e36e7e7a7accc92cfbdaa9828fd7c38fd57d6fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Pol=C3=A1=C5=A1ek?=
Date: Sat, 25 Oct 2025 02:12:59 +0200
Subject: [PATCH 10/59] CmdPal: Add keyboard shortcut (Ctrl+,) to open Settings
(#42787)
## Summary of the Pull Request
This PR introduces a new keyboard shortcut `Ctrl + ,` that opens the
Settings window directly.
## PR Checklist
- [x] Closes: #42785
- [ ] **Communication:** I've discussed this with core contributors
already. If the work hasn't been agreed, this work might be rejected
- [ ] **Tests:** Added/updated and all pass
- [ ] **Localization:** All end-user-facing strings can be localized
- [ ] **Dev docs:** Added/updated
- [ ] **New binaries:** Added on the required places
- [ ] [JSON for
signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json)
for new binaries
- [ ] [WXS for
installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs)
for new binaries and localization folder
- [ ] [YML for CI
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml)
for new test projects
- [ ] [YML for signed
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml)
- [ ] **Documentation updated:** If checked, please file a pull request
on [our docs
repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys)
and link it here: #xxx
## Detailed Description of the Pull Request / Additional comments
## Validation Steps Performed
---
.../Pages/ShellPage.xaml.cs | 41 +++++++++++--------
.../Strings/en-us/Resources.resw | 3 ++
2 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml.cs
index 6ec7f23a59..457b0fddbf 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml.cs
@@ -591,24 +591,31 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.RightWindows).HasFlag(CoreVirtualKeyStates.Down);
var onlyAlt = altPressed && !ctrlPressed && !shiftPressed && !winPressed;
- if (e.Key == VirtualKey.Left && onlyAlt)
+ var onlyCtrl = !altPressed && ctrlPressed && !shiftPressed && !winPressed;
+ switch (e.Key)
{
- WeakReferenceMessenger.Default.Send(new());
- e.Handled = true;
- }
- else if (e.Key == VirtualKey.Home && onlyAlt)
- {
- WeakReferenceMessenger.Default.Send(new(WithAnimation: false));
- e.Handled = true;
- }
- else
- {
- // The CommandBar is responsible for handling all the item keybindings,
- // since the bound context item may need to then show another
- // context menu
- TryCommandKeybindingMessage msg = new(ctrlPressed, altPressed, shiftPressed, winPressed, e.Key);
- WeakReferenceMessenger.Default.Send(msg);
- e.Handled = msg.Handled;
+ case VirtualKey.Left when onlyAlt: // Alt+Left arrow
+ WeakReferenceMessenger.Default.Send(new());
+ e.Handled = true;
+ break;
+ case VirtualKey.Home when onlyAlt: // Alt+Home
+ WeakReferenceMessenger.Default.Send(new(WithAnimation: false));
+ e.Handled = true;
+ break;
+ case (VirtualKey)188 when onlyCtrl: // Ctrl+,
+ WeakReferenceMessenger.Default.Send(new());
+ e.Handled = true;
+ break;
+ default:
+ {
+ // The CommandBar is responsible for handling all the item keybindings,
+ // since the bound context item may need to then show another
+ // context menu
+ TryCommandKeybindingMessage msg = new(ctrlPressed, altPressed, shiftPressed, winPressed, e.Key);
+ WeakReferenceMessenger.Default.Send(msg);
+ e.Handled = msg.Handled;
+ break;
+ }
}
}
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw b/src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw
index ec7ce8b68c..4eb8be9b2b 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw
@@ -471,4 +471,7 @@ Right-click to remove the key combination, thereby deactivating the shortcut.
Navigated to {0} page
+
+ Settings (Ctrl+,)
+
\ No newline at end of file
From 6e5ad11bc320f65392765a5b782e86e4337b23af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Pol=C3=A1=C5=A1ek?=
Date: Sat, 25 Oct 2025 02:15:34 +0200
Subject: [PATCH 11/59] CmdpPal: SearchBox visibility and async loading race
(#42783)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
## Summary of the Pull Request
This PR introduces two related fixes to improve the stability and
reliability of navigation and search UI behavior in the shell:
- **Ensure search box visibility is correctly updated**
- `ShellViewModel` previously set `IsSearchBoxVisible` after navigation
to the page, but didn’t update it when the value changed. While the
value isn’t expected to change dynamically, the property initialization
is asynchronous, which could cause a race condition.
- As a defensive measure, this also changes the default value of
uninitialized property to make it visible by default.
- **Cancel asynchronous focus placement if navigation changes**
- Ensures that any pending asynchronous focus operation is cancelled
when another navigation occurs before it completes.
## PR Checklist
- [x] Closes: #42782
- [ ] **Communication:** I've discussed this with core contributors
already. If the work hasn't been agreed, this work might be rejected
- [ ] **Tests:** Added/updated and all pass
- [ ] **Localization:** All end-user-facing strings can be localized
- [ ] **Dev docs:** Added/updated
- [ ] **New binaries:** Added on the required places
- [ ] [JSON for
signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json)
for new binaries
- [ ] [WXS for
installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs)
for new binaries and localization folder
- [ ] [YML for CI
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml)
for new test projects
- [ ] [YML for signed
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml)
- [ ] **Documentation updated:** If checked, please file a pull request
on [our docs
repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys)
and link it here: #xxx
## Detailed Description of the Pull Request / Additional comments
## Validation Steps Performed
---
.../PageViewModel.cs | 2 +-
.../ShellViewModel.cs | 12 +++
.../Pages/ShellPage.xaml.cs | 97 ++++++++++++++-----
3 files changed, 85 insertions(+), 26 deletions(-)
diff --git a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/PageViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/PageViewModel.cs
index 82b4b7d59e..2d750c7df3 100644
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/PageViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/PageViewModel.cs
@@ -68,7 +68,7 @@ public partial class PageViewModel : ExtensionObjectViewModel, IPageContext
// `IsLoading` property as a combo of this value and `IsInitialized`
public bool ModelIsLoading { get; protected set; } = true;
- public bool HasSearchBox { get; protected set; }
+ public bool HasSearchBox { get; protected set; } = true;
public IconInfoViewModel Icon { get; protected set; }
diff --git a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ShellViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ShellViewModel.cs
index 41db974f5b..046d7ea336 100644
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ShellViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ShellViewModel.cs
@@ -2,6 +2,7 @@
// The Microsoft Corporation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
+using System.ComponentModel;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using CommunityToolkit.Mvvm.Messaging;
@@ -48,6 +49,9 @@ public partial class ShellViewModel : ObservableObject,
var oldValue = _currentPage;
if (SetProperty(ref _currentPage, value))
{
+ oldValue.PropertyChanged -= CurrentPage_PropertyChanged;
+ value.PropertyChanged += CurrentPage_PropertyChanged;
+
if (oldValue is IDisposable disposable)
{
try
@@ -63,6 +67,14 @@ public partial class ShellViewModel : ObservableObject,
}
}
+ private void CurrentPage_PropertyChanged(object? sender, PropertyChangedEventArgs e)
+ {
+ if (e.PropertyName == nameof(PageViewModel.HasSearchBox))
+ {
+ IsSearchBoxVisible = CurrentPage.HasSearchBox;
+ }
+ }
+
private IPage? _rootPage;
private bool _isNested;
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml.cs
index 457b0fddbf..3509db9f6d 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml.cs
@@ -48,7 +48,8 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
IRecipient,
IRecipient,
IRecipient,
- INotifyPropertyChanged
+ INotifyPropertyChanged,
+ IDisposable
{
private readonly DispatcherQueue _queue = DispatcherQueue.GetForCurrentThread();
@@ -65,6 +66,9 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
private SettingsWindow? _settingsWindow;
+ private CancellationTokenSource? _focusAfterLoadedCts;
+ private WeakReference? _lastNavigatedPageRef;
+
public ShellViewModel ViewModel { get; private set; } = App.Current.Services.GetService()!;
public event PropertyChangedEventHandler? PropertyChanged;
@@ -488,6 +492,7 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
if (e.Content is Page element)
{
+ _lastNavigatedPageRef = new WeakReference(element);
element.Loaded += FocusAfterLoaded;
}
}
@@ -497,6 +502,18 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
var page = (Page)sender;
page.Loaded -= FocusAfterLoaded;
+ // Only handle focus for the latest navigated page
+ if (_lastNavigatedPageRef is null || !_lastNavigatedPageRef.TryGetTarget(out var last) || !ReferenceEquals(page, last))
+ {
+ return;
+ }
+
+ // Cancel any previous pending focus work
+ _focusAfterLoadedCts?.Cancel();
+ _focusAfterLoadedCts?.Dispose();
+ _focusAfterLoadedCts = new CancellationTokenSource();
+ var token = _focusAfterLoadedCts.Token;
+
AnnounceNavigationToPage(page);
var shouldSearchBoxBeVisible = ViewModel.CurrentPage?.HasSearchBox ?? false;
@@ -509,34 +526,57 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
}
else
{
- _ = Task.Run(async () =>
- {
- await page.DispatcherQueue.EnqueueAsync(async () =>
+ _ = Task.Run(
+ async () =>
{
- // I hate this so much, but it can take a while for the page to be ready to accept focus;
- // focusing page with MarkdownTextBlock takes up to 5 attempts (* 100ms delay between attempts)
- for (var i = 0; i < 10; i++)
+ if (token.IsCancellationRequested)
{
- if (FocusManager.FindFirstFocusableElement(page) is FrameworkElement frameworkElement)
- {
- var set = frameworkElement.Focus(FocusState.Programmatic);
- if (set)
- {
- break;
- }
- }
-
- await Task.Delay(100);
+ return;
}
- // Update the search box visibility based on the current page:
- // - We do this here after navigation so the focus is not jumping around too much,
- // it messes with screen readers if we do it too early
- // - Since this should hide the search box on content pages, it's not a problem if we
- // wait for the code above to finish trying to focus the content
- ViewModel.IsSearchBoxVisible = ViewModel.CurrentPage?.HasSearchBox ?? false;
- });
- });
+ try
+ {
+ await page.DispatcherQueue.EnqueueAsync(
+ async () =>
+ {
+ // I hate this so much, but it can take a while for the page to be ready to accept focus;
+ // focusing page with MarkdownTextBlock takes up to 5 attempts (* 100ms delay between attempts)
+ for (var i = 0; i < 10; i++)
+ {
+ token.ThrowIfCancellationRequested();
+
+ if (FocusManager.FindFirstFocusableElement(page) is FrameworkElement frameworkElement)
+ {
+ var set = frameworkElement.Focus(FocusState.Programmatic);
+ if (set)
+ {
+ break;
+ }
+ }
+
+ await Task.Delay(100, token);
+ }
+
+ token.ThrowIfCancellationRequested();
+
+ // Update the search box visibility based on the current page:
+ // - We do this here after navigation so the focus is not jumping around too much,
+ // it messes with screen readers if we do it too early
+ // - Since this should hide the search box on content pages, it's not a problem if we
+ // wait for the code above to finish trying to focus the content
+ ViewModel.IsSearchBoxVisible = ViewModel.CurrentPage?.HasSearchBox ?? false;
+ });
+ }
+ catch (OperationCanceledException)
+ {
+ // Swallow cancellation - another FocusAfterLoaded invocation superseded this one
+ }
+ catch (Exception ex)
+ {
+ Logger.LogError("Error during FocusAfterLoaded async focus work", ex);
+ }
+ },
+ token);
}
}
@@ -665,4 +705,11 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
Logger.LogError("Error handling mouse button press event", ex);
}
}
+
+ public void Dispose()
+ {
+ _focusAfterLoadedCts?.Cancel();
+ _focusAfterLoadedCts?.Dispose();
+ _focusAfterLoadedCts = null;
+ }
}
From 20188bda9b4e3e5b2ebfdb90f3b6d2462f61771f Mon Sep 17 00:00:00 2001
From: Michael Jolley
Date: Fri, 24 Oct 2025 19:16:21 -0500
Subject: [PATCH 12/59] File search now has filters (#42141)
Closes #39260
Search for all files & folders, folders only, or files only.
Enjoy.
https://github.com/user-attachments/assets/43ba93f5-dfc5-4e73-8414-547cf99dcfcf
---
.../ext/Microsoft.CmdPal.Ext.Indexer/Icons.cs | 6 +-
.../Indexer/SearchFilters.cs | 27 +++++++++
.../Pages/IndexerPage.cs | 55 ++++++++++++++++---
.../Properties/Resources.Designer.cs | 27 +++++++++
.../Properties/Resources.resx | 9 +++
5 files changed, 114 insertions(+), 10 deletions(-)
create mode 100644 src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SearchFilters.cs
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Icons.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Icons.cs
index f57b8a2d07..bd9759514c 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Icons.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Icons.cs
@@ -6,7 +6,7 @@ using Microsoft.CommandPalette.Extensions.Toolkit;
namespace Microsoft.CmdPal.Ext.Indexer;
-internal sealed class Icons
+internal static class Icons
{
internal static IconInfo FileExplorerSegoeIcon { get; } = new("\uEC50");
@@ -19,4 +19,8 @@ internal sealed class Icons
internal static IconInfo DocumentIcon { get; } = new("\uE8A5"); // Document
internal static IconInfo FolderOpenIcon { get; } = new("\uE838"); // FolderOpen
+
+ internal static IconInfo FilesIcon { get; } = new("\uF571"); // PrintAllPages
+
+ internal static IconInfo FilterIcon { get; } = new("\uE71C"); // Filter
}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SearchFilters.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SearchFilters.cs
new file mode 100644
index 0000000000..bf2e5dc451
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SearchFilters.cs
@@ -0,0 +1,27 @@
+// 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.
+
+using Microsoft.CmdPal.Ext.Indexer.Properties;
+using Microsoft.CommandPalette.Extensions;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+
+namespace Microsoft.CmdPal.Ext.Indexer.Indexer;
+
+internal sealed partial class SearchFilters : Filters
+{
+ public SearchFilters()
+ {
+ CurrentFilterId = "all";
+ }
+
+ public override IFilterItem[] GetFilters()
+ {
+ return [
+ new Filter() { Id = "all", Name = Resources.Indexer_Filter_All, Icon = Icons.FilterIcon },
+ new Separator(),
+ new Filter() { Id = "folders", Name = Resources.Indexer_Filter_Folders_Only, Icon = Icons.FolderOpenIcon },
+ new Filter() { Id = "files", Name = Resources.Indexer_Filter_Files_Only, Icon = Icons.FilesIcon },
+ ];
+ }
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Pages/IndexerPage.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Pages/IndexerPage.cs
index 3b09fcf149..0ed9458398 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Pages/IndexerPage.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Pages/IndexerPage.cs
@@ -7,6 +7,7 @@ using System.Collections.Generic;
using System.Globalization;
using System.Text.Encodings.Web;
using System.Threading.Tasks;
+using Microsoft.CmdPal.Ext.Indexer.Indexer;
using Microsoft.CmdPal.Ext.Indexer.Properties;
using Microsoft.CommandPalette.Extensions;
using Microsoft.CommandPalette.Extensions.Toolkit;
@@ -36,6 +37,11 @@ internal sealed partial class IndexerPage : DynamicListPage, IDisposable
PlaceholderText = Resources.Indexer_PlaceholderText;
_searchEngine = new();
_queryCookie = 10;
+
+ var filters = new SearchFilters();
+ filters.PropChanged += Filters_PropChanged;
+ Filters = filters;
+
CreateEmptyContent();
}
@@ -49,6 +55,11 @@ internal sealed partial class IndexerPage : DynamicListPage, IDisposable
initialQuery = query;
SearchText = query;
disposeSearchEngine = false;
+
+ var filters = new SearchFilters();
+ filters.PropChanged += Filters_PropChanged;
+ Filters = filters;
+
CreateEmptyContent();
}
@@ -79,30 +90,56 @@ internal sealed partial class IndexerPage : DynamicListPage, IDisposable
{
// {20D04FE0-3AEA-1069-A2D8-08002B30309D} is CLSID for "This PC"
const string template = "search-ms:query={0}&crumb=location:::{{20D04FE0-3AEA-1069-A2D8-08002B30309D}}";
- var encodedSearchText = UrlEncoder.Default.Encode(SearchText);
+ var fullSearchText = FullSearchString(SearchText);
+ var encodedSearchText = UrlEncoder.Default.Encode(fullSearchText);
var command = string.Format(CultureInfo.CurrentCulture, template, encodedSearchText);
ShellHelpers.OpenInShell(command);
}
public override ICommandItem EmptyContent => _isEmptyQuery ? _noSearchEmptyContent : _nothingFoundEmptyContent;
+ private void Filters_PropChanged(object sender, IPropChangedEventArgs args)
+ {
+ PerformSearch(SearchText);
+ }
+
public override void UpdateSearchText(string oldSearch, string newSearch)
{
if (oldSearch != newSearch && newSearch != initialQuery)
{
- _ = Task.Run(() =>
- {
- _isEmptyQuery = string.IsNullOrWhiteSpace(newSearch);
- Query(newSearch);
- LoadMore();
- OnPropertyChanged(nameof(EmptyContent));
- initialQuery = null;
- });
+ PerformSearch(newSearch);
}
}
+ private void PerformSearch(string newSearch)
+ {
+ var actualSearch = FullSearchString(newSearch);
+ _ = Task.Run(() =>
+ {
+ _isEmptyQuery = string.IsNullOrWhiteSpace(actualSearch);
+ Query(actualSearch);
+ LoadMore();
+ OnPropertyChanged(nameof(EmptyContent));
+ initialQuery = null;
+ });
+ }
+
public override IListItem[] GetItems() => [.. _indexerListItems];
+ private string FullSearchString(string query)
+ {
+ switch (Filters.CurrentFilterId)
+ {
+ case "folders":
+ return $"{query} kind:folders";
+ case "files":
+ return $"{query} kind:NOT folders";
+ case "all":
+ default:
+ return query;
+ }
+ }
+
public override void LoadMore()
{
IsLoading = true;
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Properties/Resources.Designer.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Properties/Resources.Designer.cs
index 44b87b05e2..d4d8f9cd0f 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Properties/Resources.Designer.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Properties/Resources.Designer.cs
@@ -177,6 +177,33 @@ namespace Microsoft.CmdPal.Ext.Indexer.Properties {
}
}
+ /// Search all files
+
+ Files and folders
+
+
+ Folders
+
+
+ Files
+
\ No newline at end of file
From 623c804093922c5ff34432096a567aa6045e4e78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Pol=C3=A1=C5=A1ek?=
Date: Sun, 26 Oct 2025 02:50:07 +0200
Subject: [PATCH 13/59] ManagedCommon: Log correct HRESULT for the inner
exception (#42178)
## Summary of the Pull Request
This PR fixes incorrect HRESULT for inner exception when an error is
logged.
## PR Checklist
- [ ] Closes: #xxx
- [ ] **Communication:** I've discussed this with core contributors
already. If the work hasn't been agreed, this work might be rejected
- [ ] **Tests:** Added/updated and all pass
- [ ] **Localization:** All end-user-facing strings can be localized
- [ ] **Dev docs:** Added/updated
- [ ] **New binaries:** Added on the required places
- [ ] [JSON for
signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json)
for new binaries
- [ ] [WXS for
installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs)
for new binaries and localization folder
- [ ] [YML for CI
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml)
for new test projects
- [ ] [YML for signed
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml)
- [ ] **Documentation updated:** If checked, please file a pull request
on [our docs
repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys)
and link it here: #xxx
## Detailed Description of the Pull Request / Additional comments
## Validation Steps Performed
---
src/common/ManagedCommon/Logger.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/common/ManagedCommon/Logger.cs b/src/common/ManagedCommon/Logger.cs
index 11115b1846..0db1614671 100644
--- a/src/common/ManagedCommon/Logger.cs
+++ b/src/common/ManagedCommon/Logger.cs
@@ -130,7 +130,7 @@ namespace ManagedCommon
{
exMessage +=
"Inner exception: " + Environment.NewLine +
- ex.InnerException.GetType() + " (" + ex.HResult + "): " + ex.InnerException.Message + Environment.NewLine;
+ ex.InnerException.GetType() + " (" + ex.InnerException.HResult + "): " + ex.InnerException.Message + Environment.NewLine;
}
exMessage +=
From e256e7968575ffde90c7c7a27d9bb8cdb063b442 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Pol=C3=A1=C5=A1ek?=
Date: Sun, 26 Oct 2025 02:51:53 +0200
Subject: [PATCH 14/59] CmdPal: Fix search box text selection in
ShellPage.GoHome (#42937)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
## Summary of the Pull Request
This PR fixes an issue where `ShellPage.GoHome` wouldn’t select the
search box text when the current page was already the home page.
In that case, the navigation stack was empty, and no code was executed
because focusing the text had been delegated to the `GoBack` operation.
## Change log one-liner
Ensured search text is selected when Go home when activated and
Highlight search on activate are both enabled.
## PR Checklist
- [x] Closes: #42443
- [x] **Communication:** I've discussed this with core contributors
already. If the work hasn't been agreed, this work might be rejected
- [x] **Tests:** Added/updated and all pass
- [x] **Localization:** All end-user-facing strings can be localized
- [x] **Dev docs:** Added/updated
- [x] **New binaries:** Added on the required places
- [x] **Documentation updated:** If checked, please file a pull request
on [our docs
repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys)
and link it here: #xxx
## Detailed Description of the Pull Request / Additional comments
## Validation Steps Performed
---
.../cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml.cs | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml.cs
index 3509db9f6d..d009c626e0 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml.cs
@@ -451,7 +451,15 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
{
while (RootFrame.CanGoBack)
{
- GoBack(withAnimation, focusSearch);
+ // don't focus on each step, just at the end
+ GoBack(withAnimation, focusSearch: false);
+ }
+
+ // focus search box, even if we were already home
+ if (focusSearch)
+ {
+ SearchBox.Focus(Microsoft.UI.Xaml.FocusState.Programmatic);
+ SearchBox.SelectSearch();
}
}
From b774e13176fdec6c72f15994714f77908c1c191f Mon Sep 17 00:00:00 2001
From: Kai Tao <69313318+vanzue@users.noreply.github.com>
Date: Mon, 27 Oct 2025 09:33:26 +0800
Subject: [PATCH 15/59] Fix the foreground style for find my mouse (#42865)
## Summary of the Pull Request
Find my mouse should use full transparent window
## PR Checklist
- [X] Closes: #42758
- [ ] **Communication:** I've discussed this with core contributors
already. If the work hasn't been agreed, this work might be rejected
- [ ] **Tests:** Added/updated and all pass
- [ ] **Localization:** All end-user-facing strings can be localized
- [ ] **Dev docs:** Added/updated
- [ ] **New binaries:** Added on the required places
- [ ] [JSON for
signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json)
for new binaries
- [ ] [WXS for
installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs)
for new binaries and localization folder
- [ ] [YML for CI
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml)
for new test projects
- [ ] [YML for signed
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml)
- [ ] **Documentation updated:** If checked, please file a pull request
on [our docs
repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys)
and link it here: #xxx
## Detailed Description of the Pull Request / Additional comments
## Validation Steps Performed
https://github.com/user-attachments/assets/75c73eb3-04bb-438c-8823-3c9f18923cc6
---
src/modules/MouseUtils/FindMyMouse/FindMyMouse.cpp | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/modules/MouseUtils/FindMyMouse/FindMyMouse.cpp b/src/modules/MouseUtils/FindMyMouse/FindMyMouse.cpp
index c94c79e178..f953af0fdd 100644
--- a/src/modules/MouseUtils/FindMyMouse/FindMyMouse.cpp
+++ b/src/modules/MouseUtils/FindMyMouse/FindMyMouse.cpp
@@ -189,7 +189,7 @@ bool SuperSonar::Initialize(HINSTANCE hinst)
return false;
}
- DWORD exStyle = WS_EX_TOOLWINDOW | Shim()->GetExtendedStyle();
+ DWORD exStyle = WS_EX_TRANSPARENT | WS_EX_LAYERED | WS_EX_TOOLWINDOW | Shim()->GetExtendedStyle();
HWND created = CreateWindowExW(exStyle, className, windowTitle, WS_POPUP, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, m_hwndOwner, nullptr, hinst, this);
if (!created)
{
@@ -269,10 +269,6 @@ LRESULT SuperSonar::BaseWndProc(UINT message, WPARAM wParam, LPARAM lParam) n
case WM_NCHITTEST:
return HTTRANSPARENT;
-
- case WM_SETCURSOR:
- SetCursor(LoadCursor(nullptr, IDC_ARROW));
- return TRUE;
}
if (message == WM_PRIV_SHORTCUT)
@@ -539,7 +535,7 @@ void SuperSonar::StartSonar()
Trace::MousePointerFocused();
// Cover the entire virtual screen.
// HACK: Draw with 1 pixel off. Otherwise, Windows glitches the task bar transparency when a transparent window fill the whole screen.
- SetWindowPos(m_hwnd, HWND_TOPMOST, GetSystemMetrics(SM_XVIRTUALSCREEN) + 1, GetSystemMetrics(SM_YVIRTUALSCREEN) + 1, GetSystemMetrics(SM_CXVIRTUALSCREEN) - 2, GetSystemMetrics(SM_CYVIRTUALSCREEN) - 2, SWP_NOACTIVATE);
+ SetWindowPos(m_hwnd, HWND_TOPMOST, GetSystemMetrics(SM_XVIRTUALSCREEN) + 1, GetSystemMetrics(SM_YVIRTUALSCREEN) + 1, GetSystemMetrics(SM_CXVIRTUALSCREEN) - 2, GetSystemMetrics(SM_CYVIRTUALSCREEN) - 2, 0);
m_sonarPos = ptNowhere;
OnMouseTimer();
UpdateMouseSnooping();
From 5d6f96559c7b37958b0176411646bc61689770af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Pol=C3=A1=C5=A1ek?=
Date: Tue, 28 Oct 2025 02:40:20 +0100
Subject: [PATCH 16/59] Multiple toys: Exclude TitleBars from tab navigation
(#42030)
## Summary of the Pull Request
This PR removes title bar controls from tab navigation, solving one of
hidden tab stops (the other being #40637).
Affected apps:
- Command Palette - Settings
- Environment Variables
- File Locksmith
- Hosts File Editor
- Registry Preview
- Settings (the search box in the title bar is still tab navigable)
## PR Checklist
- [x] Closes: #41944
- [ ] **Communication:** I've discussed this with core contributors
already. If the work hasn't been agreed, this work might be rejected
- [ ] **Tests:** Added/updated and all pass
- [ ] **Localization:** All end-user-facing strings can be localized
- [ ] **Dev docs:** Added/updated
- [ ] **New binaries:** Added on the required places
- [ ] [JSON for
signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json)
for new binaries
- [ ] [WXS for
installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs)
for new binaries and localization folder
- [ ] [YML for CI
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml)
for new test projects
- [ ] [YML for signed
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml)
- [ ] **Documentation updated:** If checked, please file a pull request
on [our docs
repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys)
and link it here: #xxx
## Detailed Description of the Pull Request / Additional comments
## Validation Steps Performed
All apps were manually tests, by pressing tab and shift + tab.
---------
Co-authored-by: Niels Laute
---
.../EnvironmentVariablesXAML/MainWindow.xaml | 2 +-
.../FileLocksmithUI/FileLocksmithXAML/MainWindow.xaml | 2 +-
src/modules/Hosts/Hosts/HostsXAML/MainWindow.xaml | 2 +-
.../cmdpal/Microsoft.CmdPal.UI/Settings/SettingsWindow.xaml | 5 ++++-
.../RegistryPreview/RegistryPreviewXAML/MainWindow.xaml | 2 +-
.../Settings.UI/SettingsXAML/Views/ShellPage.xaml | 1 +
6 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/MainWindow.xaml b/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/MainWindow.xaml
index c48b7fbb25..ae77a78caa 100644
--- a/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/MainWindow.xaml
+++ b/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/MainWindow.xaml
@@ -20,7 +20,7 @@
+
+
+
+
+
516
From 1a1894472aea33f7a84863c308042be6fe688837 Mon Sep 17 00:00:00 2001
From: leileizhang
Date: Tue, 28 Oct 2025 17:16:03 +0800
Subject: [PATCH 17/59] Fix package identity build issue (#43019)
## Summary of the Pull Request
Add an EntryPoint to the AppxManifest to fix the issue.
## PR Checklist
- [ ] Closes: #xxx
- [ ] **Communication:** I've discussed this with core contributors
already. If the work hasn't been agreed, this work might be rejected
- [ ] **Tests:** Added/updated and all pass
- [ ] **Localization:** All end-user-facing strings can be localized
- [ ] **Dev docs:** Added/updated
- [ ] **New binaries:** Added on the required places
- [ ] [JSON for
signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json)
for new binaries
- [ ] [WXS for
installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs)
for new binaries and localization folder
- [ ] [YML for CI
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml)
for new test projects
- [ ] [YML for signed
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml)
- [ ] **Documentation updated:** If checked, please file a pull request
on [our docs
repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys)
and link it here: #xxx
## Detailed Description of the Pull Request / Additional comments
## Validation Steps Performed
---
src/PackageIdentity/AppxManifest.xml | 6 +++---
src/PackageIdentity/PackageIdentity.vcxproj | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/PackageIdentity/AppxManifest.xml b/src/PackageIdentity/AppxManifest.xml
index af637229ca..2e9d52a2fa 100644
--- a/src/PackageIdentity/AppxManifest.xml
+++ b/src/PackageIdentity/AppxManifest.xml
@@ -36,7 +36,7 @@
-
+
-
+
-
+
-
Date: Tue, 28 Oct 2025 17:22:09 +0100
Subject: [PATCH 18/59] CmdPal: Ensure CommandItemViewModel reacts to changes
of replaced Command (#42982)
## Summary of the Pull Request
This PR resolves the issue with CommandItemViewModel's subscription to
changes in the associated Command when it gets replaced by another
Command. The current implementation removes the handler from the old
command but fails to attach a new one.
## Change log one-liner
## PR Checklist
- [x] Closes: #42981
- [ ] **Communication:** I've discussed this with core contributors
already. If the work hasn't been agreed, this work might be rejected
- [ ] **Tests:** Added/updated and all pass
- [ ] **Localization:** All end-user-facing strings can be localized
- [ ] **Dev docs:** Added/updated
- [ ] **New binaries:** Added on the required places
- [ ] [JSON for
signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json)
for new binaries
- [ ] [WXS for
installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs)
for new binaries and localization folder
- [ ] [YML for CI
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml)
for new test projects
- [ ] [YML for signed
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml)
- [ ] **Documentation updated:** If checked, please file a pull request
on [our docs
repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys)
and link it here: #xxx
## Detailed Description of the Pull Request / Additional comments
## Validation Steps Performed
---
.../CommandItemViewModel.cs | 1 +
.../Pages/SampleListPage.cs | 38 ++++++++++++++++++-
2 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/CommandItemViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/CommandItemViewModel.cs
index b1a977f0de..e0d2c38262 100644
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/CommandItemViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/CommandItemViewModel.cs
@@ -306,6 +306,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
Command.PropertyChanged -= Command_PropertyChanged;
Command = new(model.Command, PageContext);
Command.InitializeProperties();
+ Command.PropertyChanged += Command_PropertyChanged;
// Extensions based on Command Palette SDK < 0.3 CommandItem class won't notify when Title changes because Command
// or Command.Name change. This is a workaround to ensure that the Title is always up-to-date for extensions with old SDK.
diff --git a/src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleListPage.cs b/src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleListPage.cs
index 95f5eb84c0..2464724d50 100644
--- a/src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleListPage.cs
+++ b/src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleListPage.cs
@@ -190,7 +190,11 @@ internal sealed partial class SampleListPage : ListPage
new CommandContextItem(new EverChangingCommand("Faces", "😁", "🥺", "😍")),
new CommandContextItem(new EverChangingCommand("Hearts", "♥️", "💚", "💜", "🧡", "💛", "💙")),
],
- }
+ },
+ new ListItemChangingCommandInTime()
+ {
+ Title = "I'm a list item that changes entire command in time",
+ },
];
}
@@ -248,6 +252,11 @@ internal sealed partial class SampleListPage : ListPage
private int _currentIndex;
public EverChangingCommand(string name, params string[] icons)
+ : this(name, TimeSpan.FromSeconds(5), icons)
+ {
+ }
+
+ public EverChangingCommand(string name, TimeSpan interval, params string[] icons)
{
_icons = icons ?? throw new ArgumentNullException(nameof(icons));
if (_icons.Length == 0)
@@ -260,7 +269,7 @@ internal sealed partial class SampleListPage : ListPage
Icon = new IconInfo(_icons[_currentIndex]);
// Start timer to change icon and name every 5 seconds
- _timer = new Timer(OnTimerElapsed, null, TimeSpan.FromSeconds(5), TimeSpan.FromSeconds(5));
+ _timer = new Timer(OnTimerElapsed, null, interval, interval);
}
private void OnTimerElapsed(object state)
@@ -282,4 +291,29 @@ internal sealed partial class SampleListPage : ListPage
_timer?.Dispose();
}
}
+
+ internal sealed partial class ListItemChangingCommandInTime : ListItem
+ {
+ private readonly EverChangingCommand[] _commands =
+ [
+ new("Water", TimeSpan.FromSeconds(2), "🐬", "🐳", "🐟", "🦈"),
+ new("Faces", TimeSpan.FromSeconds(2), "😁", "🥺", "😍"),
+ new("Hearts", TimeSpan.FromSeconds(2), "♥️", "💚", "💜", "🧡", "💛", "💙"),
+ ];
+
+ private int _state;
+
+ public ListItemChangingCommandInTime()
+ {
+ Subtitle = "I change my command every 10 seconds, and the command changes it's icon every 2 seconds";
+ var timer = new Timer(OnTimerElapsed, null, TimeSpan.FromSeconds(10), TimeSpan.FromSeconds(10));
+ this.Command = _commands[0];
+ }
+
+ private void OnTimerElapsed(object state)
+ {
+ _state = (_state + 1) % _commands.Length;
+ this.Command = _commands[_state];
+ }
+ }
}
From d197af3da9bfa4b3c1d6f84e15cadf0df12e1e95 Mon Sep 17 00:00:00 2001
From: Sam Rueby
Date: Tue, 28 Oct 2025 13:56:17 -0400
Subject: [PATCH 19/59] CmdPal's search bar now accepts page up/down keyboard
strokes. (#41886)
## Summary of the Pull Request
The page up/down keys now function while the search box is focused.
## PR Checklist
- [ X ] Closes: #41877
- [ ] **Communication:** I've discussed this with core contributors
already. If the work hasn't been agreed, this work might be rejected
- [ ] **Tests:** Added/updated and all pass
- [ ] **Localization:** All end-user-facing strings can be localized
- [ ] **Dev docs:** Added/updated
- [ ] **New binaries:** Added on the required places
- [ ] [JSON for
signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json)
for new binaries
- [ ] [WXS for
installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs)
for new binaries and localization folder
- [ ] [YML for CI
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml)
for new test projects
- [ ] [YML for signed
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml)
- [ ] **Documentation updated:** If checked, please file a pull request
on [our docs
repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys)
and link it here: #xxx
## Detailed Description of the Pull Request / Additional comments
Previously, the page up/down keys only performed any action while an
item in the list was focused. The page up/down keys did not have any
effect while the search box was focused, however the up/down arrows do
have effect. This PR enables the page up/down keys while the search box
is focused.
There is a caveat here. The page up/down behavior is not consistent. I
do not see a way to tell the ListView to perform its native page up/down
function. Instead, I manually calculate roughly which item to scroll-to.
Because of this, the amount of scroll between when the search box is
focused and when an item in the ListView is focused is not consistent.
## Validation Steps Performed
In this GIF:
1. CmdPal appears
2. SearchBar focused, down/up arrow keys.
3. SearchBar focused, page down/up keys.
4. Tab to item in ListView
5. ListView item focused down/up arrow keys.
6. ListView item focused page down/up keys.
7. SearchBar focused
8. Filter "abc"
9. SearchBar focused page down/up keys.
---
.../Messages/NavigatePageDownCommand.cs | 12 ++
.../Messages/NavigatePageUpCommand.cs | 12 ++
.../Controls/SearchBar.xaml.cs | 10 ++
.../ExtViews/ListPage.xaml.cs | 155 +++++++++++++++++-
4 files changed, 183 insertions(+), 6 deletions(-)
create mode 100644 src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/NavigatePageDownCommand.cs
create mode 100644 src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/NavigatePageUpCommand.cs
diff --git a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/NavigatePageDownCommand.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/NavigatePageDownCommand.cs
new file mode 100644
index 0000000000..6c11394382
--- /dev/null
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/NavigatePageDownCommand.cs
@@ -0,0 +1,12 @@
+// 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.
+
+namespace Microsoft.CmdPal.Core.ViewModels.Messages;
+
+/// ();
+ e.Handled = true;
+ }
+ else if (e.Key == VirtualKey.PageUp)
+ {
+ WeakReferenceMessenger.Default.Send();
+ e.Handled = true;
+ }
if (InSuggestion)
{
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ListPage.xaml.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ListPage.xaml.cs
index 55b2f368ba..a28ae3e133 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ListPage.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ListPage.xaml.cs
@@ -18,6 +18,7 @@ using Microsoft.UI.Xaml.Controls.Primitives;
using Microsoft.UI.Xaml.Input;
using Microsoft.UI.Xaml.Media;
using Microsoft.UI.Xaml.Navigation;
+using Windows.Foundation;
using Windows.System;
namespace Microsoft.CmdPal.UI;
@@ -25,6 +26,8 @@ namespace Microsoft.CmdPal.UI;
public sealed partial class ListPage : Page,
IRecipient,
IRecipient,
+ IRecipient,
+ IRecipient,
IRecipient,
IRecipient
{
@@ -82,6 +85,8 @@ public sealed partial class ListPage : Page,
// RegisterAll isn't AOT compatible
WeakReferenceMessenger.Default.Register(this);
WeakReferenceMessenger.Default.Register(this);
+ WeakReferenceMessenger.Default.Register(this);
+ WeakReferenceMessenger.Default.Register(this);
WeakReferenceMessenger.Default.Register(this);
WeakReferenceMessenger.Default.Register(this);
@@ -94,6 +99,8 @@ public sealed partial class ListPage : Page,
WeakReferenceMessenger.Default.Unregister(this);
WeakReferenceMessenger.Default.Unregister(this);
+ WeakReferenceMessenger.Default.Unregister(this);
+ WeakReferenceMessenger.Default.Unregister(this);
WeakReferenceMessenger.Default.Unregister(this);
WeakReferenceMessenger.Default.Unregister(this);
@@ -181,9 +188,9 @@ public sealed partial class ListPage : Page,
var notificationText = li.Title;
UIHelper.AnnounceActionForAccessibility(
- ItemsList,
- notificationText,
- "CommandPaletteSelectedItemChanged");
+ ItemsList,
+ notificationText,
+ "CommandPaletteSelectedItemChanged");
}
}
}
@@ -296,6 +303,142 @@ public sealed partial class ListPage : Page,
}
}
+ public void Receive(NavigatePageDownCommand message)
+ {
+ var indexes = CalculateTargetIndexPageUpDownScrollTo(true);
+ if (indexes is null)
+ {
+ return;
+ }
+
+ if (indexes.Value.CurrentIndex != indexes.Value.TargetIndex)
+ {
+ ItemView.SelectedIndex = indexes.Value.TargetIndex;
+ ItemView.ScrollIntoView(ItemView.SelectedItem);
+ }
+ }
+
+ public void Receive(NavigatePageUpCommand message)
+ {
+ var indexes = CalculateTargetIndexPageUpDownScrollTo(false);
+ if (indexes is null)
+ {
+ return;
+ }
+
+ if (indexes.Value.CurrentIndex != indexes.Value.TargetIndex)
+ {
+ ItemView.SelectedIndex = indexes.Value.TargetIndex;
+ ItemView.ScrollIntoView(ItemView.SelectedItem);
+ }
+ }
+
+ ///
+ /// A tuple containing the current index and the calculated target index, or null
+ /// if a valid calculation could not be performed (for example, missing ScrollViewer).
+ ///
+ private (int CurrentIndex, int TargetIndex)? CalculateTargetIndexPageUpDownScrollTo(bool isPageDown)
+ {
+ var scroll = FindScrollViewer(ItemView);
+ if (scroll is null)
+ {
+ return null;
+ }
+
+ var viewportHeight = scroll.ViewportHeight;
+ if (viewportHeight <= 0)
+ {
+ return null;
+ }
+
+ var currentIndex = ItemView.SelectedIndex < 0 ? 0 : ItemView.SelectedIndex;
+ var itemCount = ItemView.Items.Count;
+
+ // Compute visible item heights within the ScrollViewer viewport
+ const int firstVisibleIndexNotFound = -1;
+ var firstVisibleIndex = firstVisibleIndexNotFound;
+ var visibleHeights = new List(itemCount);
+
+ for (var i = 0; i < itemCount; i++)
+ {
+ if (ItemView.ContainerFromIndex(i) is FrameworkElement container)
+ {
+ try
+ {
+ var transform = container.TransformToVisual(scroll);
+ var topLeft = transform.TransformPoint(new Point(0, 0));
+ var bottom = topLeft.Y + container.ActualHeight;
+
+ // If any part of the container is inside the viewport, consider it visible
+ if (topLeft.Y >= 0 && bottom <= viewportHeight)
+ {
+ if (firstVisibleIndex == firstVisibleIndexNotFound)
+ {
+ firstVisibleIndex = i;
+ }
+
+ visibleHeights.Add(container.ActualHeight > 0 ? container.ActualHeight : 0);
+ }
+ }
+ catch
+ {
+ // ignore transform errors and continue
+ }
+ }
+ }
+
+ var itemsPerPage = 0;
+
+ // Calculate how many items fit in the viewport based on their actual heights
+ if (visibleHeights.Count > 0)
+ {
+ double accumulated = 0;
+ for (var i = 0; i < visibleHeights.Count; i++)
+ {
+ accumulated += visibleHeights[i] <= 0 ? 1 : visibleHeights[i];
+ itemsPerPage++;
+ if (accumulated >= viewportHeight)
+ {
+ break;
+ }
+ }
+ }
+ else
+ {
+ // fallback: estimate using first measured container height
+ double itemHeight = 0;
+ for (var i = currentIndex; i < itemCount; i++)
+ {
+ if (ItemView.ContainerFromIndex(i) is FrameworkElement { ActualHeight: > 0 } c)
+ {
+ itemHeight = c.ActualHeight;
+ break;
+ }
+ }
+
+ if (itemHeight <= 0)
+ {
+ itemHeight = 1;
+ }
+
+ itemsPerPage = Math.Max(1, (int)Math.Floor(viewportHeight / itemHeight));
+ }
+
+ var targetIndex = isPageDown
+ ? Math.Min(itemCount - 1, currentIndex + Math.Max(1, itemsPerPage))
+ : Math.Max(0, currentIndex - Math.Max(1, itemsPerPage));
+
+ return (currentIndex, targetIndex);
+ }
+
private static void OnViewModelChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
{
if (d is ListPage @this)
@@ -351,11 +494,11 @@ public sealed partial class ListPage : Page,
}
}
- private ScrollViewer? FindScrollViewer(DependencyObject parent)
+ private static ScrollViewer? FindScrollViewer(DependencyObject parent)
{
- if (parent is ScrollViewer)
+ if (parent is ScrollViewer viewer)
{
- return (ScrollViewer)parent;
+ return viewer;
}
for (var i = 0; i < VisualTreeHelper.GetChildrenCount(parent); i++)
From 01fb831e4efb7d50a4b321934ecb5d204f020fd7 Mon Sep 17 00:00:00 2001
From: Jaylyn Barbee <51131738+Jaylyn-Barbee@users.noreply.github.com>
Date: Tue, 28 Oct 2025 15:00:38 -0400
Subject: [PATCH 20/59] [Light Switch] Light Switch should detect changes in
Windows Settings and treat as manual override (same as using shortcut)
(#42882)
## Summary of the Pull Request
This PR ensures that Light Switch detects changes to app/system theme
from Windows Settings. This PR also introduces new behavior where
switching the schedule will cause an instant update to the theme if
necessary.
## PR Checklist
- [x] Closes: #42878
- [x] **Communication:** I've discussed this with core contributors
already. If the work hasn't been agreed, this work might be rejected
- [ ] **Documentation updated:** If checked, please file a pull request
on [our docs
repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys)
and link it here: #xxx
---
.../LightSwitchService/LightSwitchService.cpp | 305 ++++++++++++------
.../LightSwitchService.vcxproj | 2 +
.../LightSwitchService.vcxproj.filters | 6 +
.../LightSwitchServiceObserver.cpp | 29 ++
.../LightSwitchServiceObserver.h | 16 +
.../LightSwitchSettings.cpp | 6 +
.../LightSwitchService/LightSwitchSettings.h | 2 +-
.../LightSwitchService/SettingsObserver.h | 3 +-
8 files changed, 265 insertions(+), 104 deletions(-)
create mode 100644 src/modules/LightSwitch/LightSwitchService/LightSwitchServiceObserver.cpp
create mode 100644 src/modules/LightSwitch/LightSwitchService/LightSwitchServiceObserver.h
diff --git a/src/modules/LightSwitch/LightSwitchService/LightSwitchService.cpp b/src/modules/LightSwitch/LightSwitchService/LightSwitchService.cpp
index 7ebe4a67eb..9d51a6cf75 100644
--- a/src/modules/LightSwitch/LightSwitchService/LightSwitchService.cpp
+++ b/src/modules/LightSwitch/LightSwitchService/LightSwitchService.cpp
@@ -1,4 +1,4 @@
-#include
+#include
#include
#include "ThemeScheduler.h"
#include "ThemeHelper.h"
@@ -11,11 +11,12 @@
#include
#include
#include
+#include
SERVICE_STATUS g_ServiceStatus = {};
SERVICE_STATUS_HANDLE g_StatusHandle = nullptr;
HANDLE g_ServiceStopEvent = nullptr;
-static int g_lastUpdatedDay = -1;
+extern int g_lastUpdatedDay = -1;
static ScheduleMode prevMode = ScheduleMode::Off;
static std::wstring prevLat, prevLon;
@@ -161,25 +162,18 @@ DWORD WINAPI ServiceWorkerThread(LPVOID lpParam)
Logger::info(L"[LightSwitchService] Worker thread starting...");
Logger::info(L"[LightSwitchService] Parent PID: {}", parentPid);
- // Initialize settings system
LightSwitchSettings::instance().InitFileWatcher();
- // Open the manual override event created by the module interface
+ LightSwitchServiceObserver observer({ SettingId::LightTime,
+ SettingId::DarkTime,
+ SettingId::ScheduleMode,
+ SettingId::Sunrise_Offset,
+ SettingId::Sunset_Offset });
+
HANDLE hManualOverride = OpenEventW(SYNCHRONIZE | EVENT_MODIFY_STATE, FALSE, L"POWERTOYS_LIGHTSWITCH_MANUAL_OVERRIDE");
auto applyTheme = [](int nowMinutes, int lightMinutes, int darkMinutes, const auto& settings) {
- bool isLightActive = false;
-
- if (lightMinutes < darkMinutes)
- {
- // Normal case: sunrise < sunset
- isLightActive = (nowMinutes >= lightMinutes && nowMinutes < darkMinutes);
- }
- else
- {
- // Wraparound case: e.g. light at 21:00, dark at 06:00
- isLightActive = (nowMinutes >= lightMinutes || nowMinutes < darkMinutes);
- }
+ bool isLightActive = (lightMinutes < darkMinutes) ? (nowMinutes >= lightMinutes && nowMinutes < darkMinutes) : (nowMinutes >= lightMinutes || nowMinutes < darkMinutes);
bool isSystemCurrentlyLight = GetCurrentSystemTheme();
bool isAppsCurrentlyLight = GetCurrentAppsTheme();
@@ -212,85 +206,72 @@ DWORD WINAPI ServiceWorkerThread(LPVOID lpParam)
}
};
- // --- Initial settings load ---
LightSwitchSettings::instance().LoadSettings();
auto& settings = LightSwitchSettings::instance().settings();
- // --- Initial theme application (if schedule enabled) ---
+ SYSTEMTIME st;
+ GetLocalTime(&st);
+ int nowMinutes = st.wHour * 60 + st.wMinute;
+
if (settings.scheduleMode != ScheduleMode::Off)
{
- SYSTEMTIME st;
- GetLocalTime(&st);
- int nowMinutes = st.wHour * 60 + st.wMinute;
- applyTheme(nowMinutes, settings.lightTime + settings.sunrise_offset, settings.darkTime + settings.sunset_offset, settings);
+ applyTheme(nowMinutes,
+ settings.lightTime + settings.sunrise_offset,
+ settings.darkTime + settings.sunset_offset,
+ settings);
+ Logger::trace(L"[LightSwitchService] Initialized g_lastUpdatedDay = {}", g_lastUpdatedDay);
}
else
{
Logger::info(L"[LightSwitchService] Schedule mode is OFF - ticker suspended, waiting for manual action or mode change.");
}
- // --- Main loop ---
+ g_lastUpdatedDay = st.wDay;
+ ULONGLONG lastSettingsReload = 0;
+
for (;;)
{
HANDLE waits[2] = { g_ServiceStopEvent, hParent };
DWORD count = hParent ? 2 : 1;
+ bool skipRest = false;
- LightSwitchSettings::instance().LoadSettings();
const auto& settings = LightSwitchSettings::instance().settings();
- // Check for changes in schedule mode or coordinates
- bool modeChangedToSunset = (prevMode != settings.scheduleMode &&
- settings.scheduleMode == ScheduleMode::SunsetToSunrise);
- bool coordsChanged = (prevLat != settings.latitude || prevLon != settings.longitude);
+ bool scheduleJustEnabled = (prevMode == ScheduleMode::Off && settings.scheduleMode != ScheduleMode::Off);
+ prevMode = settings.scheduleMode;
- if ((modeChangedToSunset || coordsChanged) && settings.scheduleMode == ScheduleMode::SunsetToSunrise)
- {
- Logger::info(L"[LightSwitchService] Mode or coordinates changed, recalculating sun times.");
- update_sun_times(settings);
- SYSTEMTIME st;
- GetLocalTime(&st);
- g_lastUpdatedDay = st.wDay;
- prevMode = settings.scheduleMode;
- prevLat = settings.latitude;
- prevLon = settings.longitude;
- }
-
- // If schedule is off, idle but keep watching settings and manual override
+ // ─── Handle "Schedule Off" Mode ─────────────────────────────────────────────
if (settings.scheduleMode == ScheduleMode::Off)
{
Logger::info(L"[LightSwitchService] Schedule mode OFF - suspending scheduler but keeping service alive.");
if (!hManualOverride)
- {
hManualOverride = OpenEventW(SYNCHRONIZE | EVENT_MODIFY_STATE, FALSE, L"POWERTOYS_LIGHTSWITCH_MANUAL_OVERRIDE");
- }
- HANDLE waits[4];
- DWORD count = 0;
- waits[count++] = g_ServiceStopEvent;
+ HANDLE waitsOff[4];
+ DWORD countOff = 0;
+ waitsOff[countOff++] = g_ServiceStopEvent;
if (hParent)
- waits[count++] = hParent;
+ waitsOff[countOff++] = hParent;
if (hManualOverride)
- waits[count++] = hManualOverride;
- waits[count++] = LightSwitchSettings::instance().GetSettingsChangedEvent();
+ waitsOff[countOff++] = hManualOverride;
+ waitsOff[countOff++] = LightSwitchSettings::instance().GetSettingsChangedEvent();
for (;;)
{
- DWORD wait = WaitForMultipleObjects(count, waits, FALSE, INFINITE);
+ DWORD wait = WaitForMultipleObjects(countOff, waitsOff, FALSE, INFINITE);
- // --- Handle exit signals ---
- if (wait == WAIT_OBJECT_0) // stop event
+ if (wait == WAIT_OBJECT_0)
{
Logger::info(L"[LightSwitchService] Stop event triggered - exiting worker loop.");
- break;
+ goto cleanup;
}
if (hParent && wait == WAIT_OBJECT_0 + 1)
{
Logger::info(L"[LightSwitchService] Parent exited - stopping service.");
- break;
+ goto cleanup;
}
- // --- Manual override triggered ---
if (wait == WAIT_OBJECT_0 + (hParent ? 2 : 1))
{
Logger::info(L"[LightSwitchService] Manual override received while schedule OFF.");
@@ -298,15 +279,13 @@ DWORD WINAPI ServiceWorkerThread(LPVOID lpParam)
continue;
}
- // --- Settings file changed ---
if (wait == WAIT_OBJECT_0 + (hParent ? 3 : 2))
{
Logger::trace(L"[LightSwitchService] Settings change event triggered, reloading settings...");
-
ResetEvent(LightSwitchSettings::instance().GetSettingsChangedEvent());
-
LightSwitchSettings::instance().LoadSettings();
const auto& newSettings = LightSwitchSettings::instance().settings();
+ lastSettingsReload = GetTickCount64();
if (newSettings.scheduleMode != ScheduleMode::Off)
{
@@ -315,63 +294,137 @@ DWORD WINAPI ServiceWorkerThread(LPVOID lpParam)
}
}
}
+
+ continue;
}
+ // ─── Normal Schedule Loop ───────────────────────────────────────────────────
+ ULONGLONG nowTick = GetTickCount64();
+ bool recentSettingsReload = (nowTick - lastSettingsReload < 5000);
- // --- When schedule is active, run once per minute ---
- SYSTEMTIME st;
- GetLocalTime(&st);
- int nowMinutes = st.wHour * 60 + st.wMinute;
-
- // Refresh suntimes at day boundary
- if ((g_lastUpdatedDay != st.wDay) && (settings.scheduleMode == ScheduleMode::SunsetToSunrise))
+ if (g_lastUpdatedDay != -1)
{
- update_sun_times(settings);
- g_lastUpdatedDay = st.wDay;
- Logger::info(L"[LightSwitchService] Recalculated sun times at new day boundary.");
- }
+ bool manualOverrideActive = (hManualOverride && WaitForSingleObject(hManualOverride, 0) == WAIT_OBJECT_0);
- // Have to do this again in case settings got updated in the refresh suntimes chunk
- LightSwitchSettings::instance().LoadSettings();
- const auto& currentSettings = LightSwitchSettings::instance().settings();
-
- wchar_t msg[160];
- swprintf_s(msg,
- L"[LightSwitchService] now=%02d:%02d | light=%02d:%02d | dark=%02d:%02d | mode=%d",
- st.wHour,
- st.wMinute,
- currentSettings.lightTime / 60,
- currentSettings.lightTime % 60,
- currentSettings.darkTime / 60,
- currentSettings.darkTime % 60,
- static_cast(currentSettings.scheduleMode));
- Logger::info(msg);
-
- // --- Manual override check ---
- bool manualOverrideActive = false;
- if (hManualOverride)
- {
- manualOverrideActive = (WaitForSingleObject(hManualOverride, 0) == WAIT_OBJECT_0);
- }
-
- if (manualOverrideActive)
- {
- if (nowMinutes == (currentSettings.lightTime + currentSettings.sunrise_offset) % 1440 ||
- nowMinutes == (currentSettings.darkTime + currentSettings.sunset_offset) % 1440)
+ if (settings.scheduleMode != ScheduleMode::Off && !recentSettingsReload && !scheduleJustEnabled)
{
- ResetEvent(hManualOverride);
- Logger::info(L"[LightSwitchService] Manual override cleared at boundary");
+ Logger::debug(L"[LightSwitchService] Checking if manual override is active...");
+ bool manualOverrideActive = (hManualOverride && WaitForSingleObject(hManualOverride, 0) == WAIT_OBJECT_0);
+ Logger::debug(L"[LightSwitchService] Manual override active = {}", manualOverrideActive);
+
+ if (!manualOverrideActive)
+ {
+ bool currentSystemTheme = GetCurrentSystemTheme();
+ bool currentAppsTheme = GetCurrentAppsTheme();
+
+ SYSTEMTIME st;
+ GetLocalTime(&st);
+ int nowMinutes = st.wHour * 60 + st.wMinute;
+
+ bool shouldBeLight = (settings.lightTime < settings.darkTime) ? (nowMinutes >= settings.lightTime && nowMinutes < settings.darkTime) : (nowMinutes >= settings.lightTime || nowMinutes < settings.darkTime);
+
+ Logger::debug(L"[LightSwitchService] shouldBeLight = {}", shouldBeLight);
+
+ if ((settings.changeSystem && (currentSystemTheme != shouldBeLight)) ||
+ (settings.changeApps && (currentAppsTheme != shouldBeLight)))
+ {
+ Logger::debug(L"[LightSwitchService] External theme change detected - enabling manual override");
+
+ if (!hManualOverride)
+ {
+ hManualOverride = OpenEventW(SYNCHRONIZE | EVENT_MODIFY_STATE, FALSE, L"POWERTOYS_LIGHTSWITCH_MANUAL_OVERRIDE");
+ if (!hManualOverride)
+ hManualOverride = CreateEventW(nullptr, TRUE, FALSE, L"POWERTOYS_LIGHTSWITCH_MANUAL_OVERRIDE");
+ }
+
+ if (hManualOverride)
+ {
+ SetEvent(hManualOverride);
+ Logger::info(L"[LightSwitchService] Detected manual theme change outside of LightSwitch. Triggering manual override.");
+ skipRest = true;
+ }
+ }
+ }
}
else
{
- Logger::info(L"[LightSwitchService] Skipping schedule due to manual override");
- goto sleep_until_next_minute;
+ Logger::debug(L"[LightSwitchService] Skipping external-change detection (schedule off, recent reload, or just enabled).");
}
}
- applyTheme(nowMinutes, currentSettings.lightTime + currentSettings.sunrise_offset, currentSettings.darkTime + currentSettings.sunset_offset, currentSettings);
+ // ─── Apply Schedule Logic ───────────────────────────────────────────────────
+ if (!skipRest)
+ {
+ bool modeChangedToSunset = (prevMode != settings.scheduleMode &&
+ settings.scheduleMode == ScheduleMode::SunsetToSunrise);
+ bool coordsChanged = (prevLat != settings.latitude || prevLon != settings.longitude);
- sleep_until_next_minute:
+ if ((modeChangedToSunset || coordsChanged) && settings.scheduleMode == ScheduleMode::SunsetToSunrise)
+ {
+ Logger::info(L"[LightSwitchService] Mode or coordinates changed, recalculating sun times.");
+ update_sun_times(settings);
+ SYSTEMTIME st;
+ GetLocalTime(&st);
+ g_lastUpdatedDay = st.wDay;
+ prevMode = settings.scheduleMode;
+ prevLat = settings.latitude;
+ prevLon = settings.longitude;
+ }
+
+ SYSTEMTIME st;
+ GetLocalTime(&st);
+ int nowMinutes = st.wHour * 60 + st.wMinute;
+
+ if ((g_lastUpdatedDay != st.wDay) && (settings.scheduleMode == ScheduleMode::SunsetToSunrise))
+ {
+ update_sun_times(settings);
+ g_lastUpdatedDay = st.wDay;
+ Logger::info(L"[LightSwitchService] Recalculated sun times at new day boundary.");
+ }
+
+ LightSwitchSettings::instance().LoadSettings();
+ const auto& currentSettings = LightSwitchSettings::instance().settings();
+
+ wchar_t msg[160];
+ swprintf_s(msg,
+ L"[LightSwitchService] now=%02d:%02d | light=%02d:%02d | dark=%02d:%02d | mode=%d",
+ st.wHour,
+ st.wMinute,
+ currentSettings.lightTime / 60,
+ currentSettings.lightTime % 60,
+ currentSettings.darkTime / 60,
+ currentSettings.darkTime % 60,
+ static_cast(currentSettings.scheduleMode));
+ Logger::info(msg);
+
+ bool manualOverrideActive = false;
+ if (hManualOverride)
+ manualOverrideActive = (WaitForSingleObject(hManualOverride, 0) == WAIT_OBJECT_0);
+
+ if (manualOverrideActive)
+ {
+ if (nowMinutes == (currentSettings.lightTime + currentSettings.sunrise_offset) % 1440 ||
+ nowMinutes == (currentSettings.darkTime + currentSettings.sunset_offset) % 1440)
+ {
+ ResetEvent(hManualOverride);
+ Logger::info(L"[LightSwitchService] Manual override cleared at boundary");
+ }
+ else
+ {
+ Logger::info(L"[LightSwitchService] Skipping schedule due to manual override");
+ skipRest = true;
+ }
+ }
+
+ if (!skipRest)
+ applyTheme(nowMinutes,
+ currentSettings.lightTime + currentSettings.sunrise_offset,
+ currentSettings.darkTime + currentSettings.sunset_offset,
+ currentSettings);
+ }
+
+ // ─── Wait For Next Minute Tick Or Stop Event ────────────────────────────────
+ SYSTEMTIME st;
GetLocalTime(&st);
int msToNextMinute = (60 - st.wSecond) * 1000 - st.wMilliseconds;
if (msToNextMinute < 50)
@@ -390,6 +443,7 @@ DWORD WINAPI ServiceWorkerThread(LPVOID lpParam)
}
}
+cleanup:
if (hManualOverride)
CloseHandle(hManualOverride);
if (hParent)
@@ -398,6 +452,53 @@ DWORD WINAPI ServiceWorkerThread(LPVOID lpParam)
return 0;
}
+void ApplyThemeNow()
+{
+ LightSwitchSettings::instance().LoadSettings();
+ const auto& settings = LightSwitchSettings::instance().settings();
+
+ SYSTEMTIME st;
+ GetLocalTime(&st);
+ int nowMinutes = st.wHour * 60 + st.wMinute;
+
+ bool shouldBeLight = false;
+ if (settings.lightTime < settings.darkTime)
+ shouldBeLight = (nowMinutes >= settings.lightTime && nowMinutes < settings.darkTime);
+ else
+ shouldBeLight = (nowMinutes >= settings.lightTime || nowMinutes < settings.darkTime);
+
+ bool isSystemCurrentlyLight = GetCurrentSystemTheme();
+ bool isAppsCurrentlyLight = GetCurrentAppsTheme();
+
+ Logger::info(L"[LightSwitchService] Applying (if needed) theme immediately due to schedule change.");
+
+ if (shouldBeLight)
+ {
+ if (settings.changeSystem && !isSystemCurrentlyLight)
+ {
+ SetSystemTheme(true);
+ Logger::info(L"[LightSwitchService] Changing system theme to light mode.");
+ }
+ if (settings.changeApps && !isAppsCurrentlyLight)
+ {
+ SetAppsTheme(true);
+ Logger::info(L"[LightSwitchService] Changing apps theme to light mode.");
+ }
+ }
+ else
+ {
+ if (settings.changeSystem && isSystemCurrentlyLight)
+ {
+ SetSystemTheme(false);
+ Logger::info(L"[LightSwitchService] Changing system theme to dark mode.");
+ }
+ if (settings.changeApps && isAppsCurrentlyLight)
+ {
+ SetAppsTheme(false);
+ Logger::info(L"[LightSwitchService] Changing apps theme to dark mode.");
+ }
+ }
+}
int APIENTRY wWinMain(HINSTANCE, HINSTANCE, PWSTR, int)
{
diff --git a/src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj b/src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj
index b082250f61..832f8ab50c 100644
--- a/src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj
+++ b/src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj
@@ -74,6 +74,7 @@
+
Source Files
+
+ Source Files
+
@@ -53,6 +56,9 @@
Header Files
+
+ Header Files
+
+#include "LightSwitchSettings.h"
+
+// These are defined elsewhere in your service module (ServiceWorkerThread.cpp)
+extern int g_lastUpdatedDay;
+void ApplyThemeNow();
+
+void LightSwitchServiceObserver::SettingsUpdate(SettingId id)
+{
+ Logger::info(L"[LightSwitchService] Setting changed: {}", static_cast(id));
+ g_lastUpdatedDay = -1;
+ ApplyThemeNow();
+}
+
+bool LightSwitchServiceObserver::WantsToBeNotified(SettingId id) const noexcept
+{
+ switch (id)
+ {
+ case SettingId::LightTime:
+ case SettingId::DarkTime:
+ case SettingId::ScheduleMode:
+ case SettingId::Sunrise_Offset:
+ case SettingId::Sunset_Offset:
+ return true;
+ default:
+ return false;
+ }
+}
diff --git a/src/modules/LightSwitch/LightSwitchService/LightSwitchServiceObserver.h b/src/modules/LightSwitch/LightSwitchService/LightSwitchServiceObserver.h
new file mode 100644
index 0000000000..14c88e656d
--- /dev/null
+++ b/src/modules/LightSwitch/LightSwitchService/LightSwitchServiceObserver.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "SettingsObserver.h"
+
+// The LightSwitchServiceObserver reacts when LightSwitchSettings changes.
+class LightSwitchServiceObserver : public SettingsObserver
+{
+public:
+ explicit LightSwitchServiceObserver(std::unordered_set observedSettings) :
+ SettingsObserver(std::move(observedSettings))
+ {
+ }
+
+ void SettingsUpdate(SettingId id) override;
+ bool WantsToBeNotified(SettingId id) const noexcept override;
+};
diff --git a/src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.cpp b/src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.cpp
index a7f44cca6d..2e00417001 100644
--- a/src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.cpp
+++ b/src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.cpp
@@ -39,6 +39,7 @@ void LightSwitchSettings::InitFileWatcher()
GetSettingsFileName(),
[this]() {
Logger::info(L"[LightSwitchSettings] Settings file changed, signaling event.");
+ LoadSettings();
SetEvent(m_settingsChangedEvent);
});
}
@@ -65,6 +66,11 @@ void LightSwitchSettings::NotifyObservers(SettingId id) const
}
}
+HANDLE LightSwitchSettings::GetSettingsChangedEvent() const
+{
+ return m_settingsChangedEvent;
+}
+
void LightSwitchSettings::LoadSettings()
{
try
diff --git a/src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.h b/src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.h
index 32d011313f..e5e993c696 100644
--- a/src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.h
+++ b/src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.h
@@ -79,7 +79,7 @@ public:
void LoadSettings();
- HANDLE GetSettingsChangedEvent() const { return m_settingsChangedEvent; }
+ HANDLE GetSettingsChangedEvent() const;
private:
LightSwitchSettings();
diff --git a/src/modules/LightSwitch/LightSwitchService/SettingsObserver.h b/src/modules/LightSwitch/LightSwitchService/SettingsObserver.h
index 88d0194eef..b0ddde72ec 100644
--- a/src/modules/LightSwitch/LightSwitchService/SettingsObserver.h
+++ b/src/modules/LightSwitch/LightSwitchService/SettingsObserver.h
@@ -2,6 +2,7 @@
#include
#include "SettingsConstants.h"
+#include "LightSwitchSettings.h"
class LightSwitchSettings;
@@ -22,7 +23,7 @@ public:
// Override this in your class to respond to updates
virtual void SettingsUpdate(SettingId type) {}
- bool WantsToBeNotified(SettingId type) const noexcept
+ virtual bool WantsToBeNotified(SettingId type) const noexcept
{
return m_observedSettings.contains(type);
}
From 103429b4d7b362d602aa529c3bdde40fb6d4e035 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Pol=C3=A1=C5=A1ek?=
Date: Tue, 28 Oct 2025 20:26:01 +0100
Subject: [PATCH 21/59] CmdPal: Add hidden window as owner for tool windows
(#42902)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
## Summary of the Pull Request
This PR changes the method used to hide tool windows from the taskbar
and Alt+Tab to a more reliable approach.
Previously, this was achieved by adding `WS_EX_TOOLWINDOW` to an unowned
top-level window, which proved unreliable in several scenarios.
The new implementation assigns a hidden window as the owner of each tool
window.
This ensures that the window does not appear on the taskbar even when
the Windows setting
**Settings → System → Multitasking → On the taskbar, show all opened
windows** is set to **On all desktops**.
## Change log one-liner
Fixes Command Palette windows occasionally appearing on the taskbar
under certain system settings.
## PR Checklist
- [x] Closes: #42395
- [x] **Communication:** I've discussed this with core contributors
already. If the work hasn't been agreed, this work might be rejected
- [x] **Tests:** Added/updated and all pass
- [x] **Localization:** All end-user-facing strings can be localized
- [x] **Dev docs:** Added/updated
- [x] **New binaries:** none
- [x] **Documentation updated:** no need
## Detailed Description of the Pull Request / Additional comments
## Validation Steps Performed
Tested alongside the stable CmdPal on a system with
---
.../Helpers/WindowExtensions.cs | 2 +-
.../HiddenOwnerWindowBehavior.cs | 89 +++++++++++++++++++
.../Microsoft.CmdPal.UI/MainWindow.xaml.cs | 16 ++--
.../Microsoft.CmdPal.UI/NativeMethods.txt | 7 +-
.../Microsoft.CmdPal.UI/ToastWindow.xaml.cs | 11 +--
5 files changed, 104 insertions(+), 21 deletions(-)
create mode 100644 src/modules/cmdpal/Microsoft.CmdPal.UI/HiddenOwnerWindowBehavior.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/WindowExtensions.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/WindowExtensions.cs
index 0866a57589..ee782766bc 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/WindowExtensions.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/WindowExtensions.cs
@@ -22,7 +22,7 @@ internal static class WindowExtensions
appWindow.SetIcon(@"Assets\icon.ico");
}
- private static HWND GetWindowHwnd(this Window window)
+ public static HWND GetWindowHwnd(this Window window)
{
return window is null
? throw new ArgumentNullException(nameof(window))
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/HiddenOwnerWindowBehavior.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/HiddenOwnerWindowBehavior.cs
new file mode 100644
index 0000000000..7b01afd20a
--- /dev/null
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/HiddenOwnerWindowBehavior.cs
@@ -0,0 +1,89 @@
+// 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.
+
+using Microsoft.CmdPal.UI.Helpers;
+using Microsoft.UI.Xaml;
+using Windows.Win32;
+using Windows.Win32.Foundation;
+using Windows.Win32.Graphics.Dwm;
+using Windows.Win32.UI.WindowsAndMessaging;
+
+namespace Microsoft.CmdPal.UI;
+
+///
+ /// When hiding the window, a hidden owner is assigned and
+ /// _hotkeys = [];
private readonly KeyboardListener _keyboardListener;
private readonly LocalKeyboardListener _localKeyboardListener;
+ private readonly HiddenOwnerWindowBehavior _hiddenOwnerBehavior = new();
private bool _ignoreHotKeyWhenFullScreen = true;
private DesktopAcrylicController? _acrylicController;
@@ -65,6 +66,7 @@ public sealed partial class MainWindow : WindowEx,
public MainWindow()
{
InitializeComponent();
+ HideWindow();
_hwnd = new HWND(WinRT.Interop.WindowNative.GetWindowHandle(this).ToInt32());
@@ -73,6 +75,8 @@ public sealed partial class MainWindow : WindowEx,
CommandPaletteHost.SetHostHwnd((ulong)_hwnd.Value);
}
+ _hiddenOwnerBehavior.ShowInTaskbar(this, Debugger.IsAttached);
+
_keyboardListener = new KeyboardListener();
_keyboardListener.Start();
@@ -126,16 +130,6 @@ public sealed partial class MainWindow : WindowEx,
// Force window to be created, and then cloaked. This will offset initial animation when the window is shown.
HideWindow();
-
- ApplyWindowStyle();
- }
-
- private void ApplyWindowStyle()
- {
- // Tool windows don't show up in ALT+TAB, and don't show up in the taskbar
- // Since tool windows have smaller corner radii, we need to force the normal ones
- this.ToggleExtendedWindowStyle(WINDOW_EX_STYLE.WS_EX_TOOLWINDOW, !Debugger.IsAttached);
- this.SetCornerPreference(DWM_WINDOW_CORNER_PREFERENCE.DWMWCP_ROUND);
}
private static void LocalKeyboardListener_OnKeyPressed(object? sender, LocalKeyboardListenerKeyPressedEventArgs e)
@@ -264,7 +258,7 @@ public sealed partial class MainWindow : WindowEx,
// because that would make it hard to debug the app
if (Debugger.IsAttached)
{
- ApplyWindowStyle();
+ _hiddenOwnerBehavior.ShowInTaskbar(this, true);
}
// Just to be sure, SHOW our hwnd.
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/NativeMethods.txt b/src/modules/cmdpal/Microsoft.CmdPal.UI/NativeMethods.txt
index a653eb726a..fc5a608199 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/NativeMethods.txt
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/NativeMethods.txt
@@ -58,4 +58,9 @@ GetModuleHandle
GetWindowLong
SetWindowLong
-WINDOW_EX_STYLE
\ No newline at end of file
+WINDOW_EX_STYLE
+CreateWindowEx
+WNDCLASSEXW
+RegisterClassEx
+GetStockObject
+GetModuleHandle
\ No newline at end of file
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/ToastWindow.xaml.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/ToastWindow.xaml.cs
index 9f0e63edcc..1a49fec8e0 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/ToastWindow.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/ToastWindow.xaml.cs
@@ -25,11 +25,11 @@ public sealed partial class ToastWindow : WindowEx,
IRecipient
{
private readonly HWND _hwnd;
+ private readonly DispatcherQueueTimer _debounceTimer = DispatcherQueue.GetForCurrentThread().CreateTimer();
+ private readonly HiddenOwnerWindowBehavior _hiddenOwnerWindowBehavior = new();
public ToastViewModel ViewModel { get; } = new();
- private readonly DispatcherQueueTimer _debounceTimer = DispatcherQueue.GetForCurrentThread().CreateTimer();
-
public ToastWindow()
{
this.InitializeComponent();
@@ -39,12 +39,7 @@ public sealed partial class ToastWindow : WindowEx,
this.SetIcon();
AppWindow.Title = RS_.GetString("ToastWindowTitle");
AppWindow.TitleBar.PreferredHeightOption = TitleBarHeightOption.Collapsed;
-
- // Tool windows don't show up in ALT+TAB, and don't show up in the taskbar
- // Since tool windows have smaller corner radii, we need to force the normal ones
- // to visually match system toasts.
- this.ToggleExtendedWindowStyle(WINDOW_EX_STYLE.WS_EX_TOOLWINDOW, true);
- this.SetCornerPreference(DWM_WINDOW_CORNER_PREFERENCE.DWMWCP_ROUND);
+ _hiddenOwnerWindowBehavior.ShowInTaskbar(this, false);
_hwnd = new HWND(WinRT.Interop.WindowNative.GetWindowHandle(this).ToInt32());
PInvoke.EnableWindow(_hwnd, false);
From c4e96c7ee959e106649e88b4cc8137ee2a646053 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Pol=C3=A1=C5=A1ek?=
Date: Tue, 28 Oct 2025 20:28:46 +0100
Subject: [PATCH 22/59] CmdPal: Add hints about bookmark placeholders to the
Add/Edit Bookmark form (#42793)
## Summary of the Pull Request
This PR adds a short explanation to the Add/Edit Bookmark form,
describing how to use placeholders in bookmark URLs or paths
## PR Checklist
- [x] Closes: #42265
- [ ] **Communication:** I've discussed this with core contributors
already. If the work hasn't been agreed, this work might be rejected
- [ ] **Tests:** Added/updated and all pass
- [ ] **Localization:** All end-user-facing strings can be localized
- [ ] **Dev docs:** Added/updated
- [ ] **New binaries:** Added on the required places
- [ ] [JSON for
signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json)
for new binaries
- [ ] [WXS for
installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs)
for new binaries and localization folder
- [ ] [YML for CI
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml)
for new test projects
- [ ] [YML for signed
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml)
- [ ] **Documentation updated:** If checked, please file a pull request
on [our docs
repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys)
and link it here: #xxx
## Detailed Description of the Pull Request / Additional comments
## Validation Steps Performed
---
.github/actions/spell-check/expect.txt | 2 +-
.../Pages/AddBookmarkForm.cs | 65 ++++++++++++++++---
.../Properties/Resources.Designer.cs | 50 +++++++++++++-
.../Properties/Resources.resx | 18 ++++-
4 files changed, 123 insertions(+), 12 deletions(-)
diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt
index 37ce368394..cd757f1552 100644
--- a/.github/actions/spell-check/expect.txt
+++ b/.github/actions/spell-check/expect.txt
@@ -750,7 +750,7 @@ INITDIALOG
INITGUID
INITTOLOGFONTSTRUCT
INLINEPREFIX
-Inlines
+inlines
INPC
inproc
INPUTHARDWARE
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Pages/AddBookmarkForm.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Pages/AddBookmarkForm.cs
index 6931064a90..e165bfd0d4 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Pages/AddBookmarkForm.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Pages/AddBookmarkForm.cs
@@ -30,25 +30,72 @@ internal sealed partial class AddBookmarkForm : FormContent
"type": "Input.Text",
"style": "text",
"id": "bookmark",
- "value": {{JsonSerializer.Serialize(url, BookmarkSerializationContext.Default.String)}},
- "label": "{{Resources.bookmarks_form_bookmark_label}}",
+ "value": {{EncodeString(url)}},
+ "label": {{EncodeString(Resources.bookmarks_form_bookmark_label)}},
"isRequired": true,
- "errorMessage": "{{Resources.bookmarks_form_bookmark_required}}"
+ "errorMessage": {{EncodeString(Resources.bookmarks_form_bookmark_required)}},
+ "placeholder": {{EncodeString(Resources.bookmarks_form_bookmark_placeholder)}}
},
{
"type": "Input.Text",
"style": "text",
"id": "name",
- "label": "{{Resources.bookmarks_form_name_label}}",
- "value": {{JsonSerializer.Serialize(name, BookmarkSerializationContext.Default.String)}},
- "isRequired": false,
- "errorMessage": "{{Resources.bookmarks_form_name_required}}"
+ "label": {{EncodeString(Resources.bookmarks_form_name_label)}},
+ "value": {{EncodeString(name)}},
+ "isRequired": false
+ },
+ {
+ "type": "RichTextBlock",
+ "inlines": [
+ {
+ "type": "TextRun",
+ "text": {{EncodeString(Resources.bookmarks_form_hint_text1)}},
+ "isSubtle": true,
+ "size": "Small"
+ },
+ {
+ "type": "TextRun",
+ "text": " ",
+ "isSubtle": true,
+ "size": "Small"
+ },
+ {
+ "type": "TextRun",
+ "text": {{EncodeString(Resources.bookmarks_form_hint_text2)}},
+ "fontType": "Monospace",
+ "size": "Small"
+ },
+ {
+ "type": "TextRun",
+ "text": " ",
+ "isSubtle": true,
+ "size": "Small"
+ },
+ {
+ "type": "TextRun",
+ "text": {{EncodeString(Resources.bookmarks_form_hint_text3)}},
+ "isSubtle": true,
+ "size": "Small"
+ },
+ {
+ "type": "TextRun",
+ "text": " ",
+ "isSubtle": true,
+ "size": "Small"
+ },
+ {
+ "type": "TextRun",
+ "text": {{EncodeString(Resources.bookmarks_form_hint_text4)}},
+ "fontType": "Monospace",
+ "size": "Small"
+ }
+ ]
}
],
"actions": [
{
"type": "Action.Submit",
- "title": "{{Resources.bookmarks_form_save}}",
+ "title": {{EncodeString(Resources.bookmarks_form_save)}},
"data": {
"name": "name",
"bookmark": "bookmark"
@@ -59,6 +106,8 @@ internal sealed partial class AddBookmarkForm : FormContent
""";
}
+ private static string EncodeString(string s) => JsonSerializer.Serialize(s, BookmarkSerializationContext.Default.String);
+
public override CommandResult SubmitForm(string payload)
{
var formInput = JsonNode.Parse(payload);
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Properties/Resources.Designer.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Properties/Resources.Designer.cs
index e5a65f2db3..02f95cf479 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Properties/Resources.Designer.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace Microsoft.CmdPal.Ext.Bookmarks.Properties {
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
public class Resources {
@@ -177,6 +177,15 @@ namespace Microsoft.CmdPal.Ext.Bookmarks.Properties {
}
}
+ /// "Terminal" should be the localized name of the Windows Terminal
- Name
+ Name (optional)
Save
@@ -185,4 +185,20 @@
Failed to open {0}
+
+ You can add placeholders to bookmarks, and Command Palette will prompt you to enter their values when you open the bookmark.
+A placeholder looks like this:
+
+
+ {placeholder}
+
+
+ — for example:
+
+
+ https://www.bing.com/search?q={Query}
+
+
+ Enter URL or file path, you can use {placeholders}, e.g. https://www.bing.com/search?q={Query}
+
\ No newline at end of file
From de00cbf20abf5178e27c8d4147d153602708e76f Mon Sep 17 00:00:00 2001
From: Guilherme <57814418+DevLGuilherme@users.noreply.github.com>
Date: Tue, 28 Oct 2025 16:32:09 -0300
Subject: [PATCH 23/59] [CmdPal] Fix filters visibility on non-ListPage
(#42828)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
## Summary of the Pull Request
This PR aims to fix the issue where filters from a ListPage remain
visible when navigating to other pages.
## PR Checklist
- [x] Closes: #42827
- [ ] **Communication:** I've discussed this with core contributors
already. If the work hasn't been agreed, this work might be rejected
- [ ] **Tests:** Added/updated and all pass
- [ ] **Localization:** All end-user-facing strings can be localized
- [ ] **Dev docs:** Added/updated
- [ ] **New binaries:** Added on the required places
- [ ] [JSON for
signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json)
for new binaries
- [ ] [WXS for
installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs)
for new binaries and localization folder
- [ ] [YML for CI
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml)
for new test projects
- [ ] [YML for signed
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml)
- [ ] **Documentation updated:** If checked, please file a pull request
on [our docs
repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys)
and link it here: #xxx
## Detailed Description of the Pull Request / Additional comments
### Before:
### After:
## Validation Steps Performed
---------
Co-authored-by: Jiří Polášek
---
.../ListViewModel.cs | 21 ++++-
.../PageViewModel.cs | 2 +
.../Controls/FiltersDropDown.xaml | 2 +-
.../AllIssueSamplesIndexPage.cs | 29 +++++++
...ibleAfterSwitchingFromListToContentPage.cs | 76 +++++++++++++++++++
.../SamplePagesExtension/SamplesListPage.cs | 6 ++
6 files changed, 133 insertions(+), 3 deletions(-)
create mode 100644 src/modules/cmdpal/ext/SamplePagesExtension/Pages/IssueSpecificPages/AllIssueSamplesIndexPage.cs
create mode 100644 src/modules/cmdpal/ext/SamplePagesExtension/Pages/IssueSpecificPages/SamplePageForIssue42827_FilterDropDownStaysVisibleAfterSwitchingFromListToContentPage.cs
diff --git a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ListViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ListViewModel.cs
index ebfe80533f..f9d58d0e68 100644
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ListViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ListViewModel.cs
@@ -97,6 +97,17 @@ public partial class ListViewModel : PageViewModel, IDisposable
EmptyContent = new(new(null), PageContext);
}
+ private void FiltersPropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
+ {
+ if (e.PropertyName == nameof(FiltersViewModel.Filters))
+ {
+ var filtersViewModel = sender as FiltersViewModel;
+ var hasFilters = filtersViewModel?.Filters.Length > 0;
+ HasFilters = hasFilters;
+ UpdateProperty(nameof(HasFilters));
+ }
+ }
+
// TODO: Does this need to hop to a _different_ thread, so that we don't block the extension while we're fetching?
private void Model_ItemsChanged(object sender, IItemsChangedEventArgs args) => FetchItems();
@@ -586,8 +597,11 @@ public partial class ListViewModel : PageViewModel, IDisposable
EmptyContent = new(new(model.EmptyContent), PageContext);
EmptyContent.SlowInitializeProperties();
+ Filters?.PropertyChanged -= FiltersPropertyChanged;
Filters = new(new(model.Filters), PageContext);
- Filters.InitializeProperties();
+ Filters?.PropertyChanged += FiltersPropertyChanged;
+
+ Filters?.InitializeProperties();
UpdateProperty(nameof(Filters));
FetchItems();
@@ -686,8 +700,10 @@ public partial class ListViewModel : PageViewModel, IDisposable
EmptyContent.SlowInitializeProperties();
break;
case nameof(Filters):
+ Filters?.PropertyChanged -= FiltersPropertyChanged;
Filters = new(new(model.Filters), PageContext);
- Filters.InitializeProperties();
+ Filters?.PropertyChanged += FiltersPropertyChanged;
+ Filters?.InitializeProperties();
break;
case nameof(IsLoading):
UpdateEmptyContent();
@@ -757,6 +773,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
FilteredItems.Clear();
}
+ Filters?.PropertyChanged -= FiltersPropertyChanged;
Filters?.SafeCleanup();
var model = _model.Unsafe;
diff --git a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/PageViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/PageViewModel.cs
index 2d750c7df3..62434a632a 100644
--- a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/PageViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/PageViewModel.cs
@@ -70,6 +70,8 @@ public partial class PageViewModel : ExtensionObjectViewModel, IPageContext
public bool HasSearchBox { get; protected set; } = true;
+ public bool HasFilters { get; protected set; }
+
public IconInfoViewModel Icon { get; protected set; }
public PageViewModel(IPage? model, TaskScheduler scheduler, AppExtensionHost extensionHost)
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/FiltersDropDown.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/FiltersDropDown.xaml
index 36a14965a1..f8c888e8f8 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/FiltersDropDown.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/FiltersDropDown.xaml
@@ -77,7 +77,7 @@
SelectedValue="{x:Bind ViewModel.CurrentFilter, Mode=OneWay}"
SelectionChanged="FiltersComboBox_SelectionChanged"
Style="{StaticResource ComboBoxStyle}"
- Visibility="{x:Bind ViewModel.ShouldShowFilters, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+ Visibility="{x:Bind ViewModel.ShouldShowFilters, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}, FallbackValue=Collapsed}">
+
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Assets/AdvancedPaste/Gradient.png b/src/modules/AdvancedPaste/AdvancedPaste/Assets/AdvancedPaste/Gradient.png
index 73621edfc0f883365e89a3a26a6dfd9d5f6d36d8..78a9a18606333acba281b372b402348e62b3f36d 100644
GIT binary patch
literal 26499
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%0D+>il$3#TE6&x(GbE>4=
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
z