update

Optimize the module list logic
2026-01-22 03:57:13 +01:00 · 2026-01-09 12:03:30 +08:00 · 2026-01-09 11:46:10 +08:00 · 2026-01-09 11:41:05 +08:00 · 2026-01-09 09:38:30 +08:00
27 changed files with 200 additions and 546 deletions
--- a/.github/prompts/create-commit-title.prompt.md
+++ b/.github/prompts/create-commit-title.prompt.md
@@ -6,45 +6,13 @@ description: 'Generate an 80-character git commit title for the local diff'

 # Generate Commit Title

-## Purpose
-Provide a single-line, ready-to-paste git commit title (<= 80 characters) that reflects the most important local changes since `HEAD`.
+**Goal:** Provide a ready-to-paste git commit title (<= 80 characters) that captures the most important local changes since `HEAD`.

-## Input to collect
- Run exactly one command to view the local diff:
-  ```@terminal
-  git diff HEAD
-  ```
-
-## How to decide the title
-1. From the diff, find the dominant area (e.g., `src/modules/*`, `doc/devdocs/**`) and the change type (bug fix, docs update, config tweak).
-2. Draft an imperative, plain-ASCII title that:
-   - Mentions the primary component when obvious (e.g., `FancyZones:` or `Docs:`)
-   - Stays within 80 characters and has no trailing punctuation
-
-## Final output
- Reply with only the commit title on a single line—no extra text.
-
-## PR title convention (when asked)
-Use Conventional Commits style:
-
-`<type>(<scope>): <summary>`
-
-**Allowed types**
- feat, fix, docs, refactor, perf, test, build, ci, chore
-
-**Scope rules**
- Use a short, PowerToys-focused scope (one word preferred). Common scopes:
-  - Core: `runner`, `settings-ui`, `common`, `docs`, `build`, `ci`, `installer`, `gpo`, `dsc`
-  - Modules: `fancyzones`, `powerrename`, `awake`, `colorpicker`, `imageresizer`, `keyboardmanager`, `mouseutils`, `peek`, `hosts`, `file-locksmith`, `screen-ruler`, `text-extractor`, `cropandlock`, `paste`, `powerlauncher`
- If unclear, pick the closest module or subsystem; omit only if unavoidable
-
-**Summary rules**
- Imperative, present tense (“add”, “update”, “remove”, “fix”)
- Keep it <= 72 characters when possible; be specific, avoid “misc changes”
-
-**Examples**
- `feat(fancyzones): add canvas template duplication`
- `fix(mouseutils): guard crosshair toggle when dpi info missing`
- `docs(runner): document tray icon states`
- `build(installer): align wix v5 suffix flag`
- `ci(ci): cache pipeline artifacts for x64`
+**Workflow:**
+1. Run a single command to view the local diff since the last commit:
+   ```@terminal
+   git diff HEAD
+   ```
+2. From that diff, identify the dominant area (reference key paths like `src/modules/*`, `doc/devdocs/**`, etc.), the type of change (bug fix, docs update, config tweak), and any notable impact.
+3. Draft a concise, imperative commit title summarizing the dominant change. Keep it plain ASCII, <= 80 characters, and avoid trailing punctuation. Mention the primary component when obvious (for example `FancyZones:` or `Docs:`).
+4. Respond with only the final commit title on a single line so it can be pasted directly into `git commit`.
--- a/.github/prompts/create-pr-summary.prompt.md
+++ b/.github/prompts/create-pr-summary.prompt.md
@@ -22,4 +22,3 @@ description: 'Generate a PowerToys-ready pull request description from the local
 5. Confirm validation: list tests executed with results or state why tests were skipped in line with repo guidance.
 6. Load `.github/pull_request_template.md`, mirror its section order, and populate it with the gathered facts. Include only relevant checklist entries, marking them `[x]/[ ]` and noting any intentional omissions as "N/A".
 7. Present the filled template inside a fenced ```markdown code block with no extra commentary so it is ready to paste into a PR, clearly flagging any placeholders that still need user input.
-8. Prepend the PR title above the filled template, applying the Conventional Commit type/scope rules from `.github/prompts/create-commit-title.prompt.md`; pick the dominant component from the diff and keep the title concise and imperative.
--- a/.github/prompts/fix-spelling.prompt.md
+++ b/.github/prompts/fix-spelling.prompt.md
@@ -10,8 +10,8 @@ description: 'Resolve Code scanning / check-spelling comments on the active PR'

 **Guardrails:**
 - Update only discussion threads authored by `github-actions` or `github-actions[bot]` that mention `Code scanning results / check-spelling`.
- Prefer improving the wording in the originally flagged file when it clarifies intent without changing meaning; if the wording is already clear/standard for the context, handle it via `.github/actions/spell-check/expect.txt` and reuse existing entries.
- Limit edits to the flagged text and `.github/actions/spell-check/expect.txt`; leave all other files and topics untouched.
+- Resolve findings solely by editing `.github/actions/spell-check/expect.txt`; reuse existing entries.
+- Leave all other files and topics untouched.

 **Prerequisites:**
 - Install GitHub CLI if it is not present: `winget install GitHub.cli`.
@@ -20,6 +20,5 @@ description: 'Resolve Code scanning / check-spelling comments on the active PR'
 **Workflow:**
 1. Determine the active pull request with a single `gh pr view --json number` call (default to the current branch).
 2. Fetch all PR discussion data once via `gh pr view --json comments,reviews` and filter to check-spelling comments authored by `github-actions` or `github-actions[bot]` that are not minimized; when several remain, process only the most recent comment body.
-3. For each flagged token, first consider tightening or rephrasing the original text to avoid the false positive while keeping the meaning intact; if the existing wording is already normal and professional for the context, proceed to allowlisting instead of changing it.
-4. When allowlisting, review `.github/actions/spell-check/expect.txt` for an equivalent term (for example an existing lowercase variant); when found, reuse that normalized term rather than adding a new entry, even if the flagged token differs only by casing. Only add a new entry after confirming no equivalent already exists.
-5. Add any remaining missing token to `.github/actions/spell-check/expect.txt`, keeping surrounding formatting intact.
+3. For each flagged token, review `.github/actions/spell-check/expect.txt` for an equivalent term (for example an existing lowercase variant); when found, reuse that normalized term rather than adding a new entry, even if the flagged token differs only by casing. Only add a new entry after confirming no equivalent already exists.
+4. Add any remaining missing token to `.github/actions/spell-check/expect.txt`, keeping surrounding formatting intact.
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,17 +0,0 @@
-{
-    "github.copilot.chat.reviewSelection.instructions": [
-        {
-            "file": ".github/prompts/review-pr.prompt.md"
-        }
-    ],
-    "github.copilot.chat.commitMessageGeneration.instructions": [
-        {
-            "file": ".github/prompts/create-commit-title.prompt.md"
-        }
-    ],
-    "github.copilot.chat.pullRequestDescriptionGeneration.instructions": [
-        {
-            "file": ".github/prompts/create-pr-summary.prompt.md"
-        }
-    ]
-}
--- a/DATA_AND_PRIVACY.md
+++ b/DATA_AND_PRIVACY.md
@@ -30,11 +30,7 @@ _If you want to find diagnostic data events in the source code, these two links
 - [C++ events](https://github.com/search?q=repo%3Amicrosoft%2FPowerToys+ProjectTelemetryPrivacyDataTag&type=code)

 ### General
-<table style="width:100%; table-layout:fixed">
-  <colgroup>
-    <col style="width:40%">
-    <col style="width:60%">
-  </colgroup>
+<table style="width:100%">
  <tr>
    <th>Event Name</th>
    <th>Description</th>
@@ -47,18 +43,6 @@ _If you want to find diagnostic data events in the source code, these two links
    <td>Microsoft.PowerToys.GeneralSettingsChanged</td>
    <td>Logs changes made to general settings within PowerToys.</td>
  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.Install_Fail</td>
-    <td>Triggered when the PowerToys installation process encounters an error and fails to complete.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.Repair_Cancel</td>
-    <td>Triggered when a PowerToys repair operation is cancelled by the user before completion.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.Repair_Fail</td>
-    <td>Triggered when the PowerToys repair operation fails to complete successfully due to an error.</td>
-  </tr>
  <tr>
    <td>Microsoft.PowerToys.Runner_Launch</td>
    <td>Indicates when the PowerToys Runner is launched.</td>
@@ -75,18 +59,6 @@ _If you want to find diagnostic data events in the source code, these two links
    <td>Microsoft.PowerToys.ScoobeStartedEvent</td>
    <td>Triggered when SCOOBE (Secondary Out-of-box experience) starts.</td>
  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.ShortcutConflictControlClickedEvent</td>
-    <td>Triggered when a user clicks on the Shortcut Conflict Control button in the PowerToys Settings UI Dashboard.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.ShortcutConflictDetectedEvent</td>
-    <td>Triggered when keyboard shortcut conflicts are detected in the PowerToys Settings UI Dashboard.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.ShortcutConflictResolvedEvent</td>
-    <td>Triggered when a keyboard shortcut conflict is resolved in the PowerToys Settings UI.</td>
-  </tr>
  <tr>
    <td>Microsoft.PowerToys.TrayFlyoutActivatedEvent</td>
    <td>Indicates when the tray flyout menu is activated.</td>
@@ -95,14 +67,6 @@ _If you want to find diagnostic data events in the source code, these two links
    <td>Microsoft.PowerToys.TrayFlyoutModuleRunEvent</td>
    <td>Logs when a utility from the tray flyout menu is run.</td>
  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.UnInstall_Cancel</td>
-    <td>Triggered when the PowerToys uninstallation process is cancelled by the user before completion.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.UnInstall_Fail</td>
-    <td>Triggered when the PowerToys uninstallation process fails to complete successfully due to an error. </td>
-  </tr>
  <tr>
    <td>Microsoft.PowerToys.Uninstall_Success</td>
    <td>Logs when PowerToys is successfully uninstalled (who would do such a thing!).</td>
@@ -110,19 +74,11 @@ _If you want to find diagnostic data events in the source code, these two links
 </table>

 ### OOBE (Out-of-box experience)
-<table style="width:100%; table-layout:fixed">
-  <colgroup>
-    <col style="width:40%">
-    <col style="width:60%">
-  </colgroup>
+<table style="width:100%">
  <tr>
    <th>Event Name</th>
    <th>Description</th>
  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.OobeModuleRunEvent</td>
-    <td>Triggered when a user clicks to run or launch a PowerToys module directly from the OOBE (out-of-box experience) interface.</td>
-  </tr>
  <tr>
    <td>Microsoft.PowerToys.OobeSectionEvent</td>
    <td>Occurs when OOBE is shown to the user.</td>
@@ -135,18 +91,10 @@ _If you want to find diagnostic data events in the source code, these two links
    <td>Microsoft.PowerToys.OobeStartedEvent</td>
    <td>Indicates when the out-of-box experience has been initiated.</td>
  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.OobeVariantAssignmentEvent</td>
-    <td>This event logs A/B testing assignments for experimental features, helping track which users are in control or alternate groups for feature experiments. </td>
-  </tr>
 </table>

 ### Advanced Paste
-<table style="width:100%; table-layout:fixed">
-  <colgroup>
-    <col style="width:40%">
-    <col style="width:60%">
-  </colgroup>
+<table style="width:100%">
  <tr>
    <th>Event Name</th>
    <th>Description</th>
@@ -214,11 +162,7 @@ _If you want to find diagnostic data events in the source code, these two links
 </table>

 ### Always on Top
-<table style="width:100%; table-layout:fixed">
-  <colgroup>
-    <col style="width:40%">
-    <col style="width:60%">
-  </colgroup>
+<table style="width:100%">
  <tr>
    <th>Event Name</th>
    <th>Description</th>
@@ -238,11 +182,7 @@ _If you want to find diagnostic data events in the source code, these two links
 </table>

 ### Awake
-<table style="width:100%; table-layout:fixed">
-  <colgroup>
-    <col style="width:40%">
-    <col style="width:60%">
-  </colgroup>
+<table style="width:100%">
  <tr>
    <th>Event Name</th>
    <th>Description</th>
@@ -270,11 +210,7 @@ _If you want to find diagnostic data events in the source code, these two links
 </table>

 ### Color Picker
-<table style="width:100%; table-layout:fixed">
-  <colgroup>
-    <col style="width:40%">
-    <col style="width:60%">
-  </colgroup>
+<table style="width:100%">
  <tr>
    <th>Event Name</th>
    <th>Description</th>
@@ -291,14 +227,18 @@ _If you want to find diagnostic data events in the source code, these two links
    <td>Microsoft.PowerToys.ColorPicker_Settings</td>
    <td>Triggered when the settings for the Color Picker are accessed or modified.</td>
  </tr>
+  <tr>
+    <td>Microsoft.PowerToys.ColorPickerCancelledEvent</td>
+    <td>Occurs when a color picking action is cancelled by the user.</td>
+  </tr>
+  <tr>
+    <td>Microsoft.PowerToys.ColorPickerShowEvent</td>
+    <td>Triggered when the Color Picker UI is displayed on the screen.</td>
+  </tr>  
 </table>

 ### Command Not Found
-<table style="width:100%; table-layout:fixed">
-  <colgroup>
-    <col style="width:40%">
-    <col style="width:60%">
-  </colgroup>
+<table style="width:100%">
  <tr>
    <th>Event Name</th>
    <th>Description</th>
@@ -311,6 +251,10 @@ _If you want to find diagnostic data events in the source code, these two links
    <td>Microsoft.PowerToys.CmdNotFoundInstallEvent</td>
    <td>Triggered when a Command Not Found is installed.</td>
  </tr>
+  <tr>
+    <td>Microsoft.PowerToys.CmdNotFoundInstanceCreatedEvent</td>
+    <td>Occurs when an instance of a Command Not Found is created.</td>
+  </tr>
  <tr>
    <td>Microsoft.PowerToys.CmdNotFoundUninstallEvent</td>
    <td>Triggered when Command Not Found is uninstalled after being previously installed.</td>
@@ -319,11 +263,7 @@ _If you want to find diagnostic data events in the source code, these two links

 ### Command Palette

-<table style="width:100%; table-layout:fixed">
-  <colgroup>
-    <col style="width:40%">
-    <col style="width:60%">
-  </colgroup>
+<table style="width:100%">
  <tr>
    <th>Event Name</th>
    <th>Description</th>
@@ -387,11 +327,7 @@ _If you want to find diagnostic data events in the source code, these two links
 </table>

 ### Crop And Lock
-<table style="width:100%; table-layout:fixed">
-  <colgroup>
-    <col style="width:40%">
-    <col style="width:60%">
-  </colgroup>
+<table style="width:100%">
  <tr>
    <th>Event Name</th>
    <th>Description</th>
@@ -400,26 +336,10 @@ _If you want to find diagnostic data events in the source code, these two links
    <td>Microsoft.PowerToys.CropAndLock_ActivateReparent</td>
    <td>Triggered when the cropping interface is activated for reparenting the cropped content.</td>
  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.CropAndLock_ActivateScreenshot</td>
-    <td>Triggered when the screenshot mode is activated in Crop and Lock.</td>
-  </tr>
  <tr>
    <td>Microsoft.PowerToys.CropAndLock_ActivateThumbnail</td>
    <td>Occurs when the thumbnail view for cropped content is activated.</td>
  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.CropAndLock_CreateReparentWindow</td>
-    <td>Triggered when a reparent window is created in Crop and Lock mode.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.CropAndLock_CreateScreenshotWindow</td>
-    <td>Triggered when a screenshot window is created in Crop and Lock mode.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.CropAndLock_CreateThumbnailWindow</td>
-    <td>Triggered when a thumbnail window is created in Crop and Lock mode.<-/td>
-  </tr>
  <tr>
    <td>Microsoft.PowerToys.CropAndLock_EnableCropAndLock</td>
    <td>Triggered when Crop and Lock is enabled.</td>
@@ -430,28 +350,8 @@ _If you want to find diagnostic data events in the source code, these two links
  </tr>  
 </table>

-### Cursor Wrap
-<table style="width:100%; table-layout:fixed">
-  <colgroup>
-    <col style="width:40%">
-    <col style="width:60%">
-  </colgroup>
-  <tr>
-    <th>Event Name</th>
-    <th>Description</th>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.CursorWrap_EnableCursorWrap</td>
-    <td>Triggered when Cursor Wrap is enabled or disabled.</td>
-  </tr>
-</table>
-
 ### Environment Variables
-<table style="width:100%; table-layout:fixed">
-  <colgroup>
-    <col style="width:40%">
-    <col style="width:60%">
-  </colgroup>
+<table style="width:100%">
  <tr>
    <th>Event Name</th>
    <th>Description</th>
@@ -479,11 +379,7 @@ _If you want to find diagnostic data events in the source code, these two links
 </table>

 ### FancyZones
-<table style="width:100%; table-layout:fixed">
-  <colgroup>
-    <col style="width:40%">
-    <col style="width:60%">
-  </colgroup>
+<table style="width:100%">
  <tr>
    <th>Event Name</th>
    <th>Description</th>
@@ -500,10 +396,6 @@ _If you want to find diagnostic data events in the source code, these two links
    <td>Microsoft.PowerToys.FancyZones_EnableFancyZones</td>
    <td>Occurs when FancyZones is enabled.</td>
  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.FancyZones_Error</td>
-    <td>Triggered when an error occurs within the FancyZones module. This event logs critical errors to help diagnose and troubleshoot issues with FancyZones functionality, such as failures to set up Windows hooks or other system-level operations required for window management.</td>
-  </tr>
  <tr>
    <td>Microsoft.PowerToys.FancyZones_KeyboardSnapWindowToZone</td>
    <td>Triggered when a window is snapped to a zone using the keyboard.</td>
@@ -516,6 +408,10 @@ _If you want to find diagnostic data events in the source code, these two links
    <td>Microsoft.PowerToys.FancyZones_MoveOrResizeStarted</td>
    <td>Triggered when a window move or resize action is initiated.</td>
  </tr>
+  <tr>
+    <td>Microsoft.PowerToys.FancyZones_MoveSizeEnd</td>
+    <td>Occurs when the moving or resizing of a window has ended.</td>
+  </tr>
  <tr>
    <td>Microsoft.PowerToys.FancyZones_OnKeyDown</td>
    <td>Triggered when a key is pressed down while interacting with zones.</td>
@@ -528,6 +424,10 @@ _If you want to find diagnostic data events in the source code, these two links
    <td>Microsoft.PowerToys.FancyZones_Settings</td>
    <td>Triggered when FancyZones settings are accessed or modified.</td>
  </tr>
+  <tr>
+    <td>Microsoft.PowerToys.FancyZones_SettingsChanged</td>
+    <td>Occurs when there is a change in the FancyZones settings.</td>
+  </tr>
  <tr>
    <td>Microsoft.PowerToys.FancyZones_SnapNewWindowIntoZone</td>
    <td>Triggered when a new window is snapped into a zone.</td>
@@ -548,50 +448,10 @@ _If you want to find diagnostic data events in the source code, these two links
    <td>Microsoft.PowerToys.FancyZones_CLICommand</td>
    <td>Triggered when a FancyZones CLI command is executed, logging the command name and success status.</td>
  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.FancyZonesEditorStartEvent</td>
-    <td>Triggered when the FancyZones Editor application starts. This logs the initialization of the editor UI, which is used to create and configure custom zone layouts.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.FancyZonesEditorStartFinishEvent</td>
-    <td>Triggered when the FancyZones Editor has completed loading and is ready for user interaction.</td>
-  </tr>
-</table>
-
-### File Locksmith
-<table style="width:100%; table-layout:fixed">
-  <colgroup>
-    <col style="width:40%">
-    <col style="width:60%">
-  </colgroup>
-  <tr>
-    <th>Event Name</th>
-    <th>Description</th>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.FileLocksmith_EnableFileLocksmith</td>
-    <td>Triggered when File Locksmith is enabled.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.FileLocksmith_Invoked</td>
-    <td>Occurs when File Locksmith is invoked.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.FileLocksmith_InvokedRet</td>
-    <td>Triggered when File Locksmith invocation returns a result.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.FileLocksmith_QueryContextMenuError</td>
-    <td>Occurs when there is an error querying the context menu for File Locksmith.</td>
-  </tr>
 </table>

 ### FileExplorerAddOns
-<table style="width:100%; table-layout:fixed">
-  <colgroup>
-    <col style="width:40%">
-    <col style="width:60%">
-  </colgroup>
+<table style="width:100%">
  <tr>
    <th>Event Name</th>
    <th>Description</th>
@@ -628,10 +488,6 @@ _If you want to find diagnostic data events in the source code, these two links
    <td>Microsoft.PowerToys.MarkdownFilePreviewed</td>
    <td>Triggered when a Markdown file is previewed in File Explorer.</td>
  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.MarkdownFilePreviewError</td>
-    <td>Triggered when there is an error previewing a Markdown file in File Explorer.</td>
-  </tr>
  <tr>
    <td>Microsoft.PowerToys.PdfFileHandlerLoaded</td>
    <td>Occurs when a PDF file handler is loaded.</td>
@@ -640,10 +496,6 @@ _If you want to find diagnostic data events in the source code, these two links
    <td>Microsoft.PowerToys.PdfFilePreviewed</td>
    <td>Triggered when a PDF file is previewed in File Explorer.</td>
  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.PdfFilePreviewError</td>
-    <td>Triggered when there is an error previewing a PDF file in File Explorer.</td>
-  </tr>
  <tr>
    <td>Microsoft.PowerToys.PowerPreview_Enabled</td>
    <td>Occurs when preview is enabled.</td>
@@ -660,10 +512,6 @@ _If you want to find diagnostic data events in the source code, these two links
    <td>Microsoft.PowerToys.PowerPreview_TweakUISettings_InitSet__ErrorLoadingFile</td>
    <td>Triggered when there is an error loading a file during Tweak UI settings initialization.</td>
  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.PowerPreview_TweakUISettings_SetConfig__InvalidJSONGiven</td>
-    <td>Triggered when invalid JSON is provided to the Power Preview settings configuration</td>
-  </tr>
  <tr>
    <td>Microsoft.PowerToys.PowerPreview_TweakUISettings_SuccessfullyUpdatedSettings</td>
    <td>Occurs when the Tweak UI settings for Power Preview are successfully updated.</td>
@@ -672,10 +520,6 @@ _If you want to find diagnostic data events in the source code, these two links
    <td>Microsoft.PowerToys.QoiFilePreviewed</td>
    <td>Triggered when a QOI file is previewed in File Explorer.</td>
  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.QoiFilePreviewError</td>
-    <td>Triggered when there is an error previewing a QOI (Quite OK Image) file in File Explorer.</td>
-  </tr>
  <tr>
    <td>Microsoft.PowerToys.SvgFileHandlerLoaded</td>
    <td>Occurs when an SVG file handler is loaded.</td>
@@ -690,12 +534,32 @@ _If you want to find diagnostic data events in the source code, these two links
  </tr>
 </table>

+### File Locksmith
+<table style="width:100%">
+  <tr>
+    <th>Event Name</th>
+    <th>Description</th>
+  </tr>
+  <tr>
+    <td>Microsoft.PowerToys.FileLocksmith_EnableFileLocksmith</td>
+    <td>Triggered when File Locksmith is enabled.</td>
+  </tr>
+  <tr>
+    <td>Microsoft.PowerToys.FileLocksmith_Invoked</td>
+    <td>Occurs when File Locksmith is invoked.</td>
+  </tr>
+  <tr>
+    <td>Microsoft.PowerToys.FileLocksmith_InvokedRet</td>
+    <td>Triggered when File Locksmith invocation returns a result.</td>
+  </tr>
+  <tr>
+    <td>Microsoft.PowerToys.FileLocksmith_QueryContextMenuError</td>
+    <td>Occurs when there is an error querying the context menu for File Locksmith.</td>
+  </tr>
+</table>
+
 ### Find My Mouse
-<table style="width:100%; table-layout:fixed">
-  <colgroup>
-    <col style="width:40%">
-    <col style="width:60%">
-  </colgroup>
+<table style="width:100%">
  <tr>
    <th>Event Name</th>
    <th>Description</th>
@@ -711,11 +575,7 @@ _If you want to find diagnostic data events in the source code, these two links
 </table>

 ### Hosts File Editor
-<table style="width:100%; table-layout:fixed">
-  <colgroup>
-    <col style="width:40%">
-    <col style="width:60%">
-  </colgroup>
+<table style="width:100%">
  <tr>
    <th>Event Name</th>
    <th>Description</th>
@@ -732,22 +592,10 @@ _If you want to find diagnostic data events in the source code, these two links
    <td>Microsoft.PowerToys.HostsFileEditorOpenedEvent</td>
    <td>Fires when Hosts File Editor is opened.</td>
  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.HostEditorStartEvent</td>
-    <td>Triggered when the Hosts File Editor application starts. This logs the initialization of the Hosts File Editor UI with a timestamp.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.HostEditorStartFinishEvent</td>
-    <td>Triggered when the Hosts File Editor has completed loading and is ready for user interaction.</td>
-  </tr>
 </table>

 ### Image Resizer
-<table style="width:100%; table-layout:fixed">
-  <colgroup>
-    <col style="width:40%">
-    <col style="width:60%">
-  </colgroup>
+<table style="width:100%">
  <tr>
    <th>Event Name</th>
    <th>Description</th>
@@ -764,18 +612,10 @@ _If you want to find diagnostic data events in the source code, these two links
    <td>Microsoft.PowerToys.ImageResizer_InvokedRet</td>
    <td>Fires when the Image Resizer operation is completed and returns a result.</td>
  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.ImageResizer_QueryContextMenuError</td>
-    <td>Triggered when there is an error querying the context menu for Image Resizer.</td>
-  </tr>
 </table>

 ### Keyboard Manager
-<table style="width:100%; table-layout:fixed">
-  <colgroup>
-    <col style="width:40%">
-    <col style="width:60%">
-  </colgroup>
+<table style="width:100%">
  <tr>
    <th>Event Name</th>
    <th>Description</th>
@@ -788,22 +628,10 @@ _If you want to find diagnostic data events in the source code, these two links
    <td>Microsoft.PowerToys.KeyboardManager_AppSpecificShortcutRemapCount</td>
    <td>Logs the number of application-specific shortcut remaps configured by the user.</td>
  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.KeyboardManager_AppSpecificShortcutToKeyRemapInvoked</td>
-    <td>Logs each instance when an application-specific shortcut-to-key remap is used.</td>
-  </tr>
  <tr>
    <td>Microsoft.PowerToys.KeyboardManager_AppSpecificShortcutToShortcutRemapInvoked</td>
    <td>Logs each instance when an application-specific shortcut-to-shortcut remap is used.</td>
  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.KeyboardManager_Error</td>
-    <td>Triggered when an error occurs in Keyboard Manager. This logs the error code, error message, and the method name where the error occurred.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.KeyboardManager_ErrorSendingKeyAndShortcutRemapLoadedConfiguration</td>
-    <td>Triggered when there is an error sending remapping configuration telemetry. This occurs when Keyboard Manager fails to report the loaded key and shortcut remap configurations</td>
-  </tr>
  <tr>
    <td>Microsoft.PowerToys.KeyboardManager_DailyAppSpecificShortcutToKeyRemapInvoked</td>
    <td>Logs the daily count of application-specific shortcut-to-key remaps executed by the user.</td>
@@ -867,11 +695,7 @@ _If you want to find diagnostic data events in the source code, these two links
 </table>

 ### Light Switch
-<table style="width:100%; table-layout:fixed">
-  <colgroup>
-    <col style="width:40%">
-    <col style="width:60%">
-  </colgroup>
+<table style="width:100%">
  <tr>
    <th>Event Name</th>
    <th>Description</th>
@@ -895,11 +719,7 @@ _If you want to find diagnostic data events in the source code, these two links
 </table>

 ### Mouse Highlighter
-<table style="width:100%; table-layout:fixed">
-  <colgroup>
-    <col style="width:40%">
-    <col style="width:60%">
-  </colgroup>
+<table style="width:100%">
  <tr>
    <th>Event Name</th>
    <th>Description</th>
@@ -912,18 +732,10 @@ _If you want to find diagnostic data events in the source code, these two links
    <td>Microsoft.PowerToys.MouseHighlighter_StartHighlightingSession</td>
    <td>Occurs when a new highlighting session is started.</td>
  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.MouseHighlighter_StartSpotlightSession</td>
-    <td>Triggered when a spotlight session is started in Mouse Highlighter. This occurs when the user activates the spotlight mode.</td>
-  </tr>
 </table>

 ### Mouse Jump
-<table style="width:100%; table-layout:fixed">
-  <colgroup>
-    <col style="width:40%">
-    <col style="width:60%">
-  </colgroup>
+<table style="width:100%">
  <tr>
    <th>Event Name</th>
    <th>Description</th>
@@ -947,11 +759,7 @@ _If you want to find diagnostic data events in the source code, these two links
 </table>

 ### Mouse Pointer Crosshairs
-<table style="width:100%; table-layout:fixed">
-  <colgroup>
-    <col style="width:40%">
-    <col style="width:60%">
-  </colgroup>
+<table style="width:100%">
  <tr>
    <th>Event Name</th>
    <th>Description</th>
@@ -967,11 +775,7 @@ _If you want to find diagnostic data events in the source code, these two links
 </table>

 ### Mouse Without Borders
-<table style="width:100%; table-layout:fixed">
-  <colgroup>
-    <col style="width:40%">
-    <col style="width:60%">
-  </colgroup>
+<table style="width:100%">
  <tr>
    <th>Event Name</th>
    <th>Description</th>
@@ -1023,11 +827,7 @@ _If you want to find diagnostic data events in the source code, these two links
 </table>

 ### New+
-<table style="width:100%; table-layout:fixed">
-  <colgroup>
-    <col style="width:40%">
-    <col style="width:60%">
-  </colgroup>
+<table style="width:100%">
  <tr>
    <th>Event Name</th>
    <th>Description</th>
@@ -1059,11 +859,7 @@ _If you want to find diagnostic data events in the source code, these two links
 </table>

 ### Peek
-<table style="width:100%; table-layout:fixed">
-  <colgroup>
-    <col style="width:40%">
-    <col style="width:60%">
-  </colgroup>
+<table style="width:100%">
  <tr>
    <th>Event Name</th>
    <th>Description</th>
@@ -1096,18 +892,10 @@ _If you want to find diagnostic data events in the source code, these two links
    <td>Microsoft.PowerToys.Peek_Settings</td>
    <td>Triggered when the settings for Peek are modified.</td>
  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.Peek_SpaceModeEnabled</td>
-    <td>Triggered when the Space key activation mode is enabled or disabled in Peek</td>
-  </tr>
 </table>

 ### PowerRename
-<table style="width:100%; table-layout:fixed">
-  <colgroup>
-    <col style="width:40%">
-    <col style="width:60%">
-  </colgroup>
+<table style="width:100%">
  <tr>
    <th>Event Name</th>
    <th>Description</th>
@@ -1139,11 +927,7 @@ _If you want to find diagnostic data events in the source code, these two links
 </table>

 ### PowerToys Run
-<table style="width:100%; table-layout:fixed">
-  <colgroup>
-    <col style="width:40%">
-    <col style="width:60%">
-  </colgroup>
+<table style="width:100%">
  <tr>
    <th>Event Name</th>
    <th>Description</th>
@@ -1184,14 +968,14 @@ _If you want to find diagnostic data events in the source code, these two links
    <td>Microsoft.PowerToys.RunPluginsSettingsEvent</td>
    <td>Triggered when the settings for PowerToys Run plugins are accessed or modified.</td>
  </tr>
+  <tr>
+    <td>Microsoft.PowerToys.WindowWalker_EnableWindowWalker</td>
+    <td>Triggered when the Window Walker plugin is enabled.</td>
+  </tr>
 </table>

 ### Quick Accent
-<table style="width:100%; table-layout:fixed">
-  <colgroup>
-    <col style="width:40%">
-    <col style="width:60%">
-  </colgroup>
+<table style="width:100%">
  <tr>
    <th>Event Name</th>
    <th>Description</th>
@@ -1207,11 +991,7 @@ _If you want to find diagnostic data events in the source code, these two links
 </table>

 ### Registry Preview
-<table style="width:100%; table-layout:fixed">
-  <colgroup>
-    <col style="width:40%">
-    <col style="width:60%">
-  </colgroup>
+<table style="width:100%">
  <tr>
    <th>Event Name</th>
    <th>Description</th>
@@ -1224,22 +1004,10 @@ _If you want to find diagnostic data events in the source code, these two links
    <td>Microsoft.PowerToys.RegistryPreview_EnableRegistryPreview</td>
    <td>Occurs when Registry Preview is enabled.</td>
  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.RegistryPreviewEditorStartEvent</td>
-    <td>Triggered when the Registry Preview application starts. This logs the initialization of the Registry Preview UI with a timestamp.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.RegistryPreviewEditorStartFinishEvent</td>
-    <td>Triggered when the Registry Preview application has completed loading and is ready for user interaction.</td>
-  </tr>
 </table>

 ### Screen Ruler
-<table style="width:100%; table-layout:fixed">
-  <colgroup>
-    <col style="width:40%">
-    <col style="width:60%">
-  </colgroup>
+<table style="width:100%">
  <tr>
    <th>Event Name</th>
    <th>Description</th>
@@ -1259,11 +1027,7 @@ _If you want to find diagnostic data events in the source code, these two links
 </table>

 ### Shortcut Guide
-<table style="width:100%; table-layout:fixed">
-  <colgroup>
-    <col style="width:40%">
-    <col style="width:60%">
-  </colgroup>
+<table style="width:100%">
  <tr>
    <th>Event Name</th>
    <th>Description</th>
@@ -1279,11 +1043,7 @@ _If you want to find diagnostic data events in the source code, these two links
 </table>

 ### Text Extractor
-<table style="width:100%; table-layout:fixed">
-  <colgroup>
-    <col style="width:40%">
-    <col style="width:60%">
-  </colgroup>
+<table style="width:100%">
  <tr>
    <th>Event Name</th>
    <th>Description</th>
@@ -1307,15 +1067,15 @@ _If you want to find diagnostic data events in the source code, these two links
 </table>

 ### Workspaces
-<table style="width:100%; table-layout:fixed">
-  <colgroup>
-    <col style="width:40%">
-    <col style="width:60%">
-  </colgroup>
+<table style="width:100%">
  <tr>
    <th>Event Name</th>
    <th>Description</th>
  </tr>
+  <tr>
+    <td>Microsoft.PowerToys.Projects_CLIUsage</td>
+    <td>Logs usage of command-line arguments for launching apps.</td>
+  </tr>
  <tr>
    <td>Microsoft.PowerToys.Workspaces_CreateEvent</td>
    <td>Triggered when a new workspace is created.</td>
@@ -1337,21 +1097,13 @@ _If you want to find diagnostic data events in the source code, these two links
    <td>Triggered when a workspace is launched.</td>
  </tr>
  <tr>
-    <td>Microsoft.PowerToys.WorkspacesEditorStartEvent</td>
-    <td>Triggered when the Workspaces Editor application starts. This logs the initialization of the Workspaces Editor UI with a timestamp.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.WorkspacesEditorStartFinishEvent</td>
-    <td>Triggered when the Workspaces Editor has completed loading and is ready for user interaction.</td>
+    <td>Microsoft.PowerToys.Workspaces_Settings</td>
+    <td>Logs changes to workspaces settings.</td>
  </tr>
 </table>

 ### ZoomIt
-<table style="width:100%; table-layout:fixed">
-  <colgroup>
-    <col style="width:40%">
-    <col style="width:60%">
-  </colgroup>
+<table style="width:100%">
  <tr>
    <th>Event Name</th>
    <th>Description</th>
--- a/src/common/GPOWrapperProjection/GPOWrapper.cs
+++ b/src/common/GPOWrapperProjection/GPOWrapper.cs
@@ -66,10 +66,5 @@ namespace PowerToys.GPOWrapperProjection
        {
            return (GpoRuleConfigured)PowerToys.GPOWrapper.GPOWrapper.GetConfiguredWorkspacesEnabledValue();
        }
-
-        public static GpoRuleConfigured GetConfiguredLightSwitchEnabledValue()
-        {
-            return (GpoRuleConfigured)PowerToys.GPOWrapper.GPOWrapper.GetConfiguredLightSwitchEnabledValue();
-        }
    }
 }
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/BuiltInsCommandProvider.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/BuiltInsCommandProvider.cs
@@ -21,7 +21,7 @@ public sealed partial class BuiltInsCommandProvider : CommandProvider
    public override ICommandItem[] TopLevelCommands() =>
        [
            new CommandItem(openSettings) { },
-            new CommandItem(_newExtension) { Title = _newExtension.Title },
+            new CommandItem(_newExtension) { Title = _newExtension.Title, Subtitle = Properties.Resources.builtin_new_extension_subtitle },
        ];

    public override IFallbackCommandItem[] FallbackCommands() =>
--- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.TimeDate.UnitTests/TimeDateCommandsProviderTests.cs
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.TimeDate.UnitTests/TimeDateCommandsProviderTests.cs
@@ -90,5 +90,20 @@ namespace Microsoft.CmdPal.Ext.TimeDate.UnitTests
            // Assert
            Assert.IsFalse(string.IsNullOrEmpty(displayName));
        }
+
+        [TestMethod]
+        public void GetTranslatedPluginDescriptionTest()
+        {
+            // Setup
+            var provider = new TimeDateCommandsProvider();
+
+            // Act
+            var commands = provider.TopLevelCommands();
+            var subtitle = commands[0].Subtitle;
+
+            // Assert
+            Assert.IsFalse(string.IsNullOrEmpty(subtitle));
+            Assert.IsTrue(subtitle.Contains("Show time and date values in different formats"));
+        }
    }
 }
--- a/src/modules/cmdpal/custom.props
+++ b/src/modules/cmdpal/custom.props
@@ -5,7 +5,7 @@
    <XesUseOneStoreVersioning>true</XesUseOneStoreVersioning>
    <XesBaseYearForStoreVersion>2025</XesBaseYearForStoreVersion>
    <VersionMajor>0</VersionMajor>
-    <VersionMinor>8</VersionMinor>
+    <VersionMinor>7</VersionMinor>
    <VersionInfoProductName>Microsoft Command Palette</VersionInfoProductName>
  </PropertyGroup>
 </Project>
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/CalculatorCommandProvider.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/CalculatorCommandProvider.cs
@@ -15,6 +15,7 @@ public partial class CalculatorCommandProvider : CommandProvider
    private static ISettingsInterface settings = new SettingsManager();
    private readonly ListItem _listItem = new(new CalculatorListPage(settings))
    {
+        Subtitle = Resources.calculator_top_level_subtitle,
        MoreCommands = [new CommandContextItem(((SettingsManager)settings).Settings.SettingsPage)],
    };

--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/ClipboardHistoryCommandsProvider.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/ClipboardHistoryCommandsProvider.cs
@@ -19,6 +19,7 @@ public partial class ClipboardHistoryCommandsProvider : CommandProvider
        _clipboardHistoryListItem = new ListItem(new ClipboardHistoryListPage(_settingsManager))
        {
            Title = Properties.Resources.list_item_title,
+            Subtitle = Properties.Resources.list_item_subtitle,
            Icon = Icons.ClipboardListIcon,
            MoreCommands = [
                new CommandContextItem(_settingsManager.Settings.SettingsPage),
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.RemoteDesktop/RemoteDesktopCommandProvider.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.RemoteDesktop/RemoteDesktopCommandProvider.cs
@@ -31,6 +31,7 @@ public partial class RemoteDesktopCommandProvider : CommandProvider

        listPageCommand = new CommandItem(listPage)
        {
+            Subtitle = Resources.remotedesktop_subtitle,
            Icon = Icons.RDPIcon,
            MoreCommands = [
                new CommandContextItem(settingsManager.Settings.SettingsPage),
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/ShellCommandsProvider.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/ShellCommandsProvider.cs
@@ -39,6 +39,7 @@ public partial class ShellCommandsProvider : CommandProvider
        {
            Icon = Icons.RunV2Icon,
            Title = Resources.shell_command_name,
+            Subtitle = Resources.cmd_plugin_description,
            MoreCommands = [
                new CommandContextItem(Settings.SettingsPage),
            ],
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.TimeDate/TimeDateCommandsProvider.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.TimeDate/TimeDateCommandsProvider.cs
@@ -28,6 +28,7 @@ public sealed partial class TimeDateCommandsProvider : CommandProvider
        {
            Icon = _timeDateExtensionPage.Icon,
            Title = Resources.Microsoft_plugin_timedate_plugin_name,
+            Subtitle = GetTranslatedPluginDescription(),
            MoreCommands = [new CommandContextItem(_settingsManager.Settings.SettingsPage)],
        };

--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/WindowWalkerCommandsProvider.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/WindowWalkerCommandsProvider.cs
@@ -26,6 +26,7 @@ public partial class WindowWalkerCommandsProvider : CommandProvider
        _windowWalkerPageItem = new CommandItem(new WindowWalkerListPage())
        {
            Title = Resources.window_walker_top_level_command_title,
+            Subtitle = Resources.windowwalker_name,
            MoreCommands = [
                new CommandContextItem(Settings.SettingsPage),
            ],
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsSettings/WindowsSettingsCommandsProvider.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsSettings/WindowsSettingsCommandsProvider.cs
@@ -30,6 +30,7 @@ public sealed partial class WindowsSettingsCommandsProvider : CommandProvider
        _searchSettingsListItem = new CommandItem(new WindowsSettingsListPage(_windowsSettings))
        {
            Title = Resources.settings_title,
+            Subtitle = Resources.settings_subtitle,
        };
        _fallback = new(_windowsSettings);

--- a/src/modules/fancyzones/FancyZonesLib/EditorParameters.cpp
+++ b/src/modules/fancyzones/FancyZonesLib/EditorParameters.cpp
@@ -191,22 +191,27 @@ bool EditorParameters::Save(const WorkAreaConfiguration& configuration, OnThread

            monitorJson.dpi = dpi;
            
-            // Get DPI-unaware values for dimensions (virtual coordinates for WPF sizing)
-            MONITORINFOEX monitorInfoUnaware{};
+            MONITORINFOEX monitorInfo{};
            dpiUnawareThread.submit(OnThreadExecutor::task_t{ [&] {
-                monitorInfoUnaware.cbSize = sizeof(monitorInfoUnaware);
-                GetMonitorInfo(monitor, &monitorInfoUnaware);
+                monitorInfo.cbSize = sizeof(monitorInfo);
+                if (!GetMonitorInfo(monitor, &monitorInfo))
+                {
+                    return;
+                }
            } }).wait();

-            // Dimensions in virtual coordinates (from DPI-unaware thread)
-            monitorJson.monitorWidth = monitorInfoUnaware.rcMonitor.right - monitorInfoUnaware.rcMonitor.left;
-            monitorJson.monitorHeight = monitorInfoUnaware.rcMonitor.bottom - monitorInfoUnaware.rcMonitor.top;
-            monitorJson.workAreaWidth = monitorInfoUnaware.rcWork.right - monitorInfoUnaware.rcWork.left;
-            monitorJson.workAreaHeight = monitorInfoUnaware.rcWork.bottom - monitorInfoUnaware.rcWork.top;
+            float width = static_cast<float>(monitorInfo.rcMonitor.right - monitorInfo.rcMonitor.left);
+            float height = static_cast<float>(monitorInfo.rcMonitor.bottom - monitorInfo.rcMonitor.top);
+            DPIAware::Convert(monitor, width, height);

-            // Position in virtual coordinates (matched by DPI-unaware context in WPF editor)
-            monitorJson.left = monitorInfoUnaware.rcWork.left;
-            monitorJson.top = monitorInfoUnaware.rcWork.top;
+            monitorJson.monitorWidth = static_cast<int>(std::roundf(width));
+            monitorJson.monitorHeight = static_cast<int>(std::roundf(height));
+
+            // use dpi-unaware values
+            monitorJson.top = monitorInfo.rcWork.top;
+            monitorJson.left = monitorInfo.rcWork.left;
+            monitorJson.workAreaWidth = monitorInfo.rcWork.right - monitorInfo.rcWork.left;
+            monitorJson.workAreaHeight = monitorInfo.rcWork.bottom - monitorInfo.rcWork.top;

            argsJson.monitors.emplace_back(std::move(monitorJson));
        }
--- a/src/modules/fancyzones/editor/FancyZonesEditor/Models/Monitor.cs
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/Models/Monitor.cs
@@ -67,18 +67,10 @@ namespace FancyZonesEditor.Models
            Window.KeyUp += ((App)Application.Current).App_KeyUp;
            Window.KeyDown += ((App)Application.Current).App_KeyDown;

-            // Store for DPI-unaware positioning
-            _virtualWorkArea = workArea;
-
-            // Set initial WPF properties
            Window.Left = workArea.X;
            Window.Top = workArea.Y;
            Window.Width = workArea.Width;
            Window.Height = workArea.Height;
-
-            // After HWND is created, reposition using DPI-unaware context
-            // This matches the C++ backend which uses a DPI-unaware thread
-            Window.SourceInitialized += OnWindowSourceInitialized;
        }

        public Monitor(string monitorName, string monitorInstanceId, string monitorSerialNumber, string virtualDesktop, int dpi, Rect workArea, Size monitorSize)
@@ -88,33 +80,16 @@ namespace FancyZonesEditor.Models
        }

        private LayoutSettings _settings;
-        private Rect _virtualWorkArea;
-
-        private void OnWindowSourceInitialized(object sender, EventArgs e)
-        {
-            // Reposition window using DPI-unaware context to match the virtual coordinates
-            // from the FancyZones C++ backend (which uses a DPI-unaware thread)
-            Utils.NativeMethods.SetWindowPositionDpiUnaware(
-                Window,
-                (int)_virtualWorkArea.X,
-                (int)_virtualWorkArea.Y,
-                (int)_virtualWorkArea.Width,
-                (int)_virtualWorkArea.Height);
-        }

        public void Scale(double scaleFactor)
        {
            Device.Scale(scaleFactor);

-            _virtualWorkArea = Device.WorkAreaRect;
-
-            // Use DPI-unaware positioning
-            Utils.NativeMethods.SetWindowPositionDpiUnaware(
-                Window,
-                (int)_virtualWorkArea.X,
-                (int)_virtualWorkArea.Y,
-                (int)_virtualWorkArea.Width,
-                (int)_virtualWorkArea.Height);
+            var workArea = Device.WorkAreaRect;
+            Window.Left = workArea.X;
+            Window.Top = workArea.Y;
+            Window.Width = workArea.Width;
+            Window.Height = workArea.Height;
        }

        public void SetLayoutSettings(LayoutModel model)
--- a/src/modules/fancyzones/editor/FancyZonesEditor/Models/MonitorInfoModel.cs
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/Models/MonitorInfoModel.cs
@@ -69,11 +69,7 @@ namespace FancyZonesEditor.Utils
                }
                else
                {
-                    // Convert virtual coordinates to physical resolution by applying DPI scale
-                    double scale = DPI / 96.0;
-                    int physicalWidth = (int)Math.Round(ScreenBoundsWidth * scale);
-                    int physicalHeight = (int)Math.Round(ScreenBoundsHeight * scale);
-                    return physicalWidth + " × " + physicalHeight;
+                    return ScreenBoundsWidth + " × " + ScreenBoundsHeight;
                }
            }
        }
--- a/src/modules/fancyzones/editor/FancyZonesEditor/Utils/NativeMethods.cs
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/Utils/NativeMethods.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

@@ -17,48 +17,14 @@ namespace FancyZonesEditor.Utils
        [DllImport("user32.dll")]
        private static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);

-        [DllImport("user32.dll", SetLastError = true)]
-        private static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int X, int Y, int cx, int cy, uint uFlags);
-
-        [DllImport("user32.dll")]
-        private static extern IntPtr SetThreadDpiAwarenessContext(IntPtr dpiContext);
-
        private const int GWL_EX_STYLE = -20;
        private const int WS_EX_APPWINDOW = 0x00040000;
        private const int WS_EX_TOOLWINDOW = 0x00000080;
-        private const uint SWP_NOZORDER = 0x0004;
-        private const uint SWP_NOACTIVATE = 0x0010;
-
-        private static readonly IntPtr DPI_AWARENESS_CONTEXT_UNAWARE = new IntPtr(-1);

        public static void SetWindowStyleToolWindow(Window hwnd)
        {
            var helper = new WindowInteropHelper(hwnd).Handle;
            _ = SetWindowLong(helper, GWL_EX_STYLE, (GetWindowLong(helper, GWL_EX_STYLE) | WS_EX_TOOLWINDOW) & ~WS_EX_APPWINDOW);
        }
-
-        /// <summary>
-        /// Positions a WPF window using DPI-unaware context to match the virtual coordinates
-        /// from the FancyZones C++ backend (which uses a DPI-unaware thread).
-        /// This fixes overlay positioning on mixed-DPI multi-monitor setups.
-        /// </summary>
-        public static void SetWindowPositionDpiUnaware(Window window, int x, int y, int width, int height)
-        {
-            var helper = new WindowInteropHelper(window).Handle;
-            if (helper != IntPtr.Zero)
-            {
-                // Temporarily switch to DPI-unaware context to position window.
-                // This matches how the C++ backend gets coordinates via dpiUnawareThread.
-                IntPtr oldContext = SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_UNAWARE);
-                try
-                {
-                    SetWindowPos(helper, IntPtr.Zero, x, y, width, height, SWP_NOZORDER | SWP_NOACTIVATE);
-                }
-                finally
-                {
-                    SetThreadDpiAwarenessContext(oldContext);
-                }
-            }
-        }
    }
 }
--- a/src/settings-ui/Settings.UI.Controls/QuickAccess/QuickAccessLauncher.cs
+++ b/src/settings-ui/Settings.UI.Controls/QuickAccess/QuickAccessLauncher.cs
@@ -112,13 +112,6 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
                        eventHandle.Set();
                    }

-                    return true;
-                case ModuleType.LightSwitch:
-                    using (var eventHandle = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.LightSwitchToggleEvent()))
-                    {
-                        eventHandle.Set();
-                    }
-
                    return true;
                default:
                    return false;
--- a/src/settings-ui/Settings.UI.Controls/QuickAccess/QuickAccessViewModel.cs
+++ b/src/settings-ui/Settings.UI.Controls/QuickAccess/QuickAccessViewModel.cs
@@ -64,7 +64,6 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
            AddFlyoutMenuItem(ModuleType.EnvironmentVariables);
            AddFlyoutMenuItem(ModuleType.FancyZones);
            AddFlyoutMenuItem(ModuleType.Hosts);
-            AddFlyoutMenuItem(ModuleType.LightSwitch);
            AddFlyoutMenuItem(ModuleType.PowerLauncher);
            AddFlyoutMenuItem(ModuleType.PowerOCR);
            AddFlyoutMenuItem(ModuleType.RegistryPreview);
@@ -121,7 +120,6 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
            {
                ModuleType.ColorPicker => SettingsRepository<ColorPickerSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.ActivationShortcut.ToString(),
                ModuleType.FancyZones => SettingsRepository<FancyZonesSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.FancyzonesEditorHotkey.Value.ToString(),
-                ModuleType.LightSwitch => SettingsRepository<LightSwitchSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.ToggleThemeHotkey.Value.ToString(),
                ModuleType.PowerLauncher => SettingsRepository<PowerLauncherSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.OpenPowerLauncher.ToString(),
                ModuleType.PowerOCR => SettingsRepository<PowerOcrSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.ActivationShortcut.ToString(),
                ModuleType.Workspaces => SettingsRepository<WorkspacesSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.Hotkey.Value.ToString(),
--- a/src/settings-ui/Settings.UI.Library/LightSwitchSettings.cs
+++ b/src/settings-ui/Settings.UI.Library/LightSwitchSettings.cs
@@ -11,7 +11,7 @@ using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Settings.UI.Library.Helpers;
 using Microsoft.PowerToys.Settings.UI.Library.Interfaces;

-namespace Microsoft.PowerToys.Settings.UI.Library
+namespace Settings.UI.Library
 {
    public class LightSwitchSettings : BasePTModuleSettings, ISettingsConfig, ICloneable, IHotkeyConfig
    {
--- a/src/settings-ui/Settings.UI.Library/SettingsSerializationContext.cs
+++ b/src/settings-ui/Settings.UI.Library/SettingsSerializationContext.cs
@@ -56,7 +56,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
    [JsonSerializable(typeof(HostsSettings))]
    [JsonSerializable(typeof(ImageResizerSettings))]
    [JsonSerializable(typeof(KeyboardManagerSettings))]
-    [JsonSerializable(typeof(LightSwitchSettings))]
+    [JsonSerializable(typeof(SettingsUILibrary.LightSwitchSettings))]
    [JsonSerializable(typeof(MeasureToolSettings))]
    [JsonSerializable(typeof(MouseHighlighterSettings))]
    [JsonSerializable(typeof(MouseJumpSettings))]
--- a/src/settings-ui/Settings.UI/SerializationContext/SourceGenerationContextContext.cs
+++ b/src/settings-ui/Settings.UI/SerializationContext/SourceGenerationContextContext.cs
@@ -23,7 +23,7 @@ namespace Microsoft.PowerToys.Settings.UI.SerializationContext;
 [JsonSerializable(typeof(FileLocksmithSettings))]
 [JsonSerializable(typeof(FindMyMouseSettings))]
 [JsonSerializable(typeof(IList<PowerToysReleaseInfo>))]
-[JsonSerializable(typeof(LightSwitchSettings))]
+[JsonSerializable(typeof(SettingsUILibrary.LightSwitchSettings))]
 [JsonSerializable(typeof(MeasureToolSettings))]
 [JsonSerializable(typeof(MouseHighlighterSettings))]
 [JsonSerializable(typeof(MouseJumpSettings))]
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/LightSwitchPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/LightSwitchPage.xaml.cs
@@ -50,7 +50,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
            var darkSettings = this.moduleSettingsRepository.SettingsConfig;

            // Pass them into the ViewModel
-            this.ViewModel = new LightSwitchViewModel(this.generalSettingsRepository, darkSettings, ShellPage.SendDefaultIPCMessage);
+            this.ViewModel = new LightSwitchViewModel(darkSettings, this.sendConfigMsg);
            this.ViewModel.PropertyChanged += ViewModel_PropertyChanged;

            this.LoadSettings(this.generalSettingsRepository, this.moduleSettingsRepository);
@@ -185,7 +185,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
            // need to save the values
            this.ViewModel.Latitude = latitude.ToString(CultureInfo.InvariantCulture);
            this.ViewModel.Longitude = longitude.ToString(CultureInfo.InvariantCulture);
-            this.ViewModel.SyncButtonInformation = $"{this.ViewModel.Latitude}°, {this.ViewModel.Longitude}°";
+            this.ViewModel.SyncButtonInformation = $"{this.ViewModel.Latitude}<EFBFBD>, {this.ViewModel.Longitude}<EFBFBD>";

            var result = SunCalc.CalculateSunriseSunset(latitude, longitude, DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day);

@@ -293,7 +293,18 @@ namespace Microsoft.PowerToys.Settings.UI.Views

        private void UpdateEnabledState(bool recommendedState)
        {
-            ViewModel.RefreshEnabledState();
+            var enabledGpoRuleConfiguration = GPOWrapper.GetConfiguredLightSwitchEnabledValue();
+
+            if (enabledGpoRuleConfiguration == GpoRuleConfigured.Disabled || enabledGpoRuleConfiguration == GpoRuleConfigured.Enabled)
+            {
+                // Get the enabled state from GPO.
+                this.ViewModel.IsEnabledGpoConfigured = true;
+                this.ViewModel.EnabledGPOConfiguration = enabledGpoRuleConfiguration == GpoRuleConfigured.Enabled;
+            }
+            else
+            {
+                this.ViewModel.IsEnabled = recommendedState;
+            }
        }

        private async void SyncLocationButton_Click(object sender, RoutedEventArgs e)
--- a/src/settings-ui/Settings.UI/ViewModels/LightSwitchViewModel.cs
+++ b/src/settings-ui/Settings.UI/ViewModels/LightSwitchViewModel.cs
@@ -14,10 +14,8 @@ using ManagedCommon;
 using Microsoft.PowerToys.Settings.UI.Helpers;
 using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Settings.UI.Library.Helpers;
-using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
 using Microsoft.PowerToys.Settings.UI.SerializationContext;
 using Newtonsoft.Json.Linq;
-using PowerToys.GPOWrapper;
 using Settings.UI.Library;
 using Settings.UI.Library.Helpers;

@@ -29,16 +27,10 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels

        private Func<string, int> SendConfigMSG { get; }

-        private GeneralSettings GeneralSettingsConfig { get; set; }
-
        public ObservableCollection<SearchLocation> SearchLocations { get; } = new();

-        public LightSwitchViewModel(ISettingsRepository<GeneralSettings> settingsRepository, LightSwitchSettings initialSettings = null, Func<string, int> ipcMSGCallBackFunc = null)
+        public LightSwitchViewModel(LightSwitchSettings initialSettings = null, Func<string, int> ipcMSGCallBackFunc = null)
        {
-            ArgumentNullException.ThrowIfNull(settingsRepository);
-            GeneralSettingsConfig = settingsRepository.SettingsConfig;
-            InitializeEnabledValue();
-
            _moduleSettings = initialSettings ?? new LightSwitchSettings();
            SendConfigMSG = ipcMSGCallBackFunc;

@@ -66,21 +58,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
            return hotkeysDict;
        }

-        private void InitializeEnabledValue()
-        {
-            _enabledGpoRuleConfiguration = GPOWrapper.GetConfiguredLightSwitchEnabledValue();
-            if (_enabledGpoRuleConfiguration == GpoRuleConfigured.Disabled || _enabledGpoRuleConfiguration == GpoRuleConfigured.Enabled)
-            {
-                // Get the enabled state from GPO.
-                _enabledStateIsGPOConfigured = true;
-                _isEnabled = _enabledGpoRuleConfiguration == GpoRuleConfigured.Enabled;
-            }
-            else
-            {
-                _isEnabled = GeneralSettingsConfig.Enabled.LightSwitch;
-            }
-        }
-
        private void ForceLightNow()
        {
            Logger.LogInfo("Sending custom action: forceLight");
@@ -116,26 +93,33 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels

        public bool IsEnabled
        {
-            get => _isEnabled;
-
-            set
+            get
            {
                if (_enabledStateIsGPOConfigured)
                {
-                    // If it's GPO configured, shouldn't be able to change this state.
-                    return;
+                    return _enabledGPOConfiguration;
                }
-
-                if (value != _isEnabled)
+                else
                {
+                    return _isEnabled;
+                }
+            }
+
+            set
+            {
+                if (_isEnabled != value)
+                {
+                    if (_enabledStateIsGPOConfigured)
+                    {
+                        // If it's GPO configured, shouldn't be able to change this state.
+                        return;
+                    }
+
                    _isEnabled = value;

-                    // Set the status in the general settings configuration
-                    GeneralSettingsConfig.Enabled.LightSwitch = value;
-                    OutGoingGeneralSettings snd = new OutGoingGeneralSettings(GeneralSettingsConfig);
+                    RefreshEnabledState();

-                    SendConfigMSG(snd.ToString());
-                    OnPropertyChanged(nameof(IsEnabled));
+                    NotifyPropertyChanged();
                }
            }
        }
@@ -143,16 +127,24 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
        public bool IsEnabledGpoConfigured
        {
            get => _enabledStateIsGPOConfigured;
-        }
-
-        public GpoRuleConfigured EnabledGPOConfiguration
-        {
-            get => _enabledGpoRuleConfiguration;
            set
            {
-                if (_enabledGpoRuleConfiguration != value)
+                if (_enabledStateIsGPOConfigured != value)
                {
-                    _enabledGpoRuleConfiguration = value;
+                    _enabledStateIsGPOConfigured = value;
+                    NotifyPropertyChanged();
+                }
+            }
+        }
+
+        public bool EnabledGPOConfiguration
+        {
+            get => _enabledGPOConfiguration;
+            set
+            {
+                if (_enabledGPOConfiguration != value)
+                {
+                    _enabledGPOConfiguration = value;
                    NotifyPropertyChanged();
                }
            }
@@ -583,7 +575,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
        }

        private bool _enabledStateIsGPOConfigured;
-        private GpoRuleConfigured _enabledGpoRuleConfiguration;
+        private bool _enabledGPOConfiguration;
        private LightSwitchSettings _moduleSettings;
        private bool _isEnabled;
        private HotkeySettings _toggleThemeHotkey;
Author	SHA1	Message	Date
Shawn Yuan (from Dev Box)	ca4b52e8c2	update	2026-01-09 12:03:30 +08:00
Shawn Yuan (from Dev Box)	be06f081d1	update	2026-01-09 11:46:10 +08:00
Shawn Yuan (from Dev Box)	7cb41d8fe3	Optimize the module list logic	2026-01-09 11:41:05 +08:00
Shawn Yuan (from Dev Box)	73dda5a08d	Fix quickaccess localization issue	2026-01-09 09:38:30 +08:00