Commit Graph

4237 Commits

Author SHA1 Message Date
copilot-swe-agent[bot]
72acc2fa19 Fix InnerException access pattern for null safety
Co-authored-by: moooyo <42196638+moooyo@users.noreply.github.com>
2025-12-26 09:42:36 +00:00
Yu Leng
f1e45faee6 Refactor native structs into individual files, PascalCase
Split NativeStructures.cs into one file per struct, renaming all native structs to PascalCase for C# idioms. Updated all usages and P/Invoke signatures to match new names. Renamed GWL_WNDPROC to GwlWndproc for consistency. No functional changes; improves code organization and maintainability.
2025-12-26 17:25:03 +08:00
Yu Leng
c9e4f110ff Add PowerDisplay module and clean up interop code
Remove unused Win32 interop structs and P/Invoke methods to reduce code bloat. Refactor TrayIconService constants to use PascalCase for .NET naming consistency. Integrate the new PowerDisplay module into the OOBE UI and dashboard, marking it as "new" for user visibility.
2025-12-26 17:13:12 +08:00
Yu Leng
95dae4278e Refactor interop: use CsWin32 LUID, update P/Invoke
Replaced manual Luid struct with CsWin32-generated LUID from Windows.Win32.Foundation. Updated all P/Invoke signatures to use unsafe pointer parameters for blittable structs, improving AOT compatibility. Moved DdcCiValidationResult and MonitorDisplayInfo to separate files. Added Microsoft.Windows.CsWin32 package and configuration for LUID. Removed redundant code and updated usages throughout. These changes modernize the interop layer and improve maintainability.
2025-12-26 17:04:33 +08:00
Yu Leng
d17e27cf0d Refactor IPC message handling and improve disposal logic
- Move IPCMessageAction to its own file for better organization and remove it from JsonSourceGenerationContext.cs.
- Refactor MainViewModel.Dispose to use expanded try-catch blocks for each disposable resource, improving robustness.
- Clean up IdentifyWindow.xaml.cs by removing obsolete commented code.
- Update using directives and namespaces for clarity.
- Add copyright and license headers to IPCMessageAction.cs.
2025-12-26 17:00:49 +08:00
Yu Leng
e88bae1bac Refactor SettingsDeepLink.OpenSettings signature
Removed the unused SettingsWindow enum and refactored OpenSettings to accept only the mainExecutableIsOnTheParentFolder parameter. Updated all call sites to match the new method signature, simplifying settings navigation logic.
2025-12-26 16:30:49 +08:00
Yu Leng
92e26496f9 Refactor GetVcpFeatureAsync method to remove optional featureName parameter for improved clarity 2025-12-26 16:18:30 +08:00
Yu Leng
bb7c70828b Refactor logging in various services and controllers to reduce verbosity and improve clarity
- Removed excessive logging statements in DdcCiController, NativeConstants, WmiController, DisplayRotationService, MonitorStateManager, ProfileService, DisplayChangeWatcher, HotkeyService, MonitorManager, TrayIconService, WindowHelper, MainWindow, MainViewModel, and MonitorViewModel.
- Updated comments and documentation for better understanding and maintenance.
- Streamlined the logging process to focus on critical information while eliminating redundant logs.
2025-12-26 16:16:08 +08:00
Yu Leng
39af9ce532 Merge branch 'yuleng/display/pr/3' of https://github.com/microsoft/PowerToys into yuleng/display/pr/3 2025-12-26 15:01:37 +08:00
Yu Leng
551344b7e5 Refactor resource disposal in MainViewModel for improved safety 2025-12-26 15:01:32 +08:00
moooyo
598629e57b Update src/modules/powerdisplay/PowerDisplayModuleInterface/PowerDisplayModuleInterface.vcxproj.filters
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-12-26 14:43:51 +08:00
Yu Leng
1e3cec08e3 Optimize monitor restore: skip unchanged settings
RestoreMonitorSettingsAsync now only updates hardware values if
the saved state differs from the current value, reducing
unnecessary writes. Updated comments to reflect this logic.
2025-12-26 14:02:55 +08:00
Yu Leng
bdb47bf534 Refactor SettingsUtils usage, async monitor restore
Refactor to use SettingsUtils class instead of ISettingsUtils throughout the project. Make monitor settings restoration on startup fully asynchronous, ensuring hardware values are applied before initialization completes. Improve initialization flow and user feedback by keeping IsScanning true until restore finishes, and only firing InitializationCompleted after all settings are restored. Update comments and logging for clarity.
2025-12-24 16:43:17 +08:00
Yu Leng
003977a95d Switch monitor state key from HardwareId to Monitor.Id
Update codebase to use Monitor.Id as the key for monitor state management instead of HardwareId. This includes updating method parameters, documentation, and internal logic to ensure monitor state persistence and retrieval are based on the unique monitor identifier. Improves clarity and robustness of monitor state handling.
2025-12-24 16:23:27 +08:00
Yu Leng
f86dcb3863 merge main 2025-12-24 15:32:09 +08:00
Yu Leng
98a54dba9b Implement in-process hotkey handling for PowerDisplay
Switch PowerDisplay to handle activation hotkeys in-process using a new HotkeyService and the Win32 RegisterHotKey API, following the CmdPal pattern. Hotkey registration and handling are now managed directly in PowerDisplay.exe, with settings changes propagated via a new HotkeyUpdatedPowerDisplayEvent. The Runner no longer registers or manages PowerDisplay hotkeys. Updated the default activation shortcut to Win+Alt+D. This improves reliability and avoids IPC timing issues with the previous centralized hotkey mechanism.
2025-12-19 15:45:30 +08:00
Yu Leng
ebb1758d73 Remove unused ShowPowerDisplayEvent from PowerDisplay
All references to ShowPowerDisplayEvent have been removed, including its constant definition, related methods, event handle management, and event registration. Error handling and shutdown logic were updated accordingly. Documentation was revised to clarify event naming and provide a Toggle event example. This cleans up legacy code for an event that is no longer used.
2025-12-19 11:52:32 +08:00
Yu Leng
9c35ac90f7 Reorder mc:Ignorable attribute in IdentifyWindow.xaml
Moved mc:Ignorable="d" to the end of the WindowEx attribute list for improved clarity and consistency. No functional changes were made.
2025-12-19 11:35:05 +08:00
Yu Leng
11565dbf1c Refactor window management to use WinUIEx WindowEx
Refactored IdentifyWindow and MainWindow to leverage WinUIEx's WindowEx for declarative window configuration. Moved window properties (resizability, minimizability, title bar, taskbar visibility) to XAML. Replaced manual AppWindow and Win32 interop logic with WinUIEx APIs, simplifying DPI scaling and window positioning. This reduces code complexity and improves maintainability.
2025-12-19 11:02:49 +08:00
Yu Leng
40a1245b86 Move IsAlwaysOnTop logic from XAML to code-behind
IsAlwaysOnTop is now set programmatically in MainWindow.xaml.cs instead of XAML. Added logging for when IsAlwaysOnTop is set. Removed BringToFront() calls and related logs, as setting IsAlwaysOnTop in code ensures the window stays on top.
2025-12-19 10:54:06 +08:00
Yu Leng
3fa044d44c Improve telemetry accuracy for hotkey and tray icon settings
Updated telemetry event to use ActivationShortcut.IsValid() for hotkey status and ShowSystemTrayIcon for tray icon status, replacing previous properties. This ensures more accurate and meaningful telemetry data collection.
2025-12-18 14:11:30 +08:00
Yu Leng
d6a851535d Add PowerDisplay settings telemetry event support
Enables Runner to signal PowerDisplay to send a settings telemetry event. Introduces a new named event for this purpose, updates interop constants, and implements logic in PowerDisplay to gather and log current settings and profile info to telemetry. Also improves process shutdown handling in Runner. This enhances diagnostics and observability for the PowerDisplay module.
2025-12-18 14:00:35 +08:00
Yu Leng
03088b8a2e Refactor PowerDisplay init; remove WiX installer logic
Refactored initialization so MainViewModel handles all async startup and signals MainWindow via a new InitializationCompleted event. Removed redundant initialization code from MainWindow. Updated process termination list to include PowerToys.PowerDisplay.exe. Removed PowerDisplay.wxs, shifting asset installation logic out of the WiX setup project. Improves separation of concerns and UI readiness handling.
2025-12-18 00:22:35 +08:00
Yu Leng
7cc00fa99e Improve window sizing and tray icon reliability
- Enforce minimum window height and adjust sizing logic to respect both min/max limits
- Call Activate() before Show() to ensure window visibility
- Add fallback Activate() if window is not visible after show
- Enhance tray icon error handling and retry logic if Shell_NotifyIcon fails
- Add warning logs for missing monitors and tray icon failures
2025-12-17 17:41:43 +08:00
Yu Leng
3e203649f1 Ensure profile application runs on UI thread
Refactored profile application to dispatch to the UI thread using _dispatcherQueue, as MonitorViewModels are UI-bound. Introduced an async helper to manage completion signaling. Improved error logging to include exception types and inner exception details for better diagnostics.
2025-12-17 14:53:43 +08:00
Yu Leng
08c0944cca Improve LightSwitch profile sync and settings persistence
- Sync internal theme state and notify PowerDisplay on manual override (hotkey) in LightSwitchStateManager.
- Add SaveSettings() in LightSwitchViewModel and call it on relevant property changes to ensure immediate settings persistence.
- Clear profile selection and update settings if a configured profile no longer exists, preventing invalid references.
- Update expect.txt with new recognized keywords.
2025-12-17 14:48:52 +08:00
Yu Leng
30da716be3 Refactor single-instance logic to prevent extra log files
Rework startup to check for existing instance before logger
initialization, following the Command Palette pattern. Only the
primary instance now creates log files. Remove DecideRedirection()
and move redirection logic directly into Main. Update
RedirectActivationTo to avoid logging before logger is initialized.
Clarify log messages and ensure activation handler is only
registered for the primary instance.
2025-12-17 14:17:32 +08:00
Yu Leng
6f5477442b Improve logging and single-instance handling for PowerDisplay
- Add detailed logging throughout C# app and C++ module for lifecycle, event, and process actions
- Remove "process ready" event; switch to Command Palette single-instance pattern using AppInstance and RedirectActivationToAsync
- Refactor process launch and event registration logic for clarity and reliability
- Enhance error handling and diagnostics for telemetry, language, and hotkey parsing
- Make event handling and UI thread marshalling more robust and traceable
- Clean up obsolete code and improve comments for maintainability
2025-12-17 14:08:43 +08:00
Yu Leng
5e0909fa36 Position window on monitor under mouse cursor
Updated window positioning logic to use the monitor where the mouse cursor is currently located, instead of always using the primary monitor. Added GetMonitorAtCursor method leveraging Win32 GetCursorPos to determine cursor location and select the appropriate monitor. Updated documentation and added necessary P/Invoke support.
2025-12-17 13:21:59 +08:00
Yu Leng
bfc5765530 Remove custom exit logic and cleanup from MainWindow
Refactored MainWindow.xaml.cs to eliminate the _isExiting flag and all related shutdown/cleanup methods, including UnsubscribeFromViewModelEvents, SetExiting, FastShutdown, and ExitApplication. The OnWindowClosed handler now always hides the window instead of handling exit scenarios, simplifying window lifecycle management.
2025-12-17 10:59:34 +08:00
Yu Leng
6eeb18b4c8 Refactor window management to use WinUIEx APIs
Replaces direct Win32/AppWindow interop in MainWindow.xaml.cs with higher-level WinUIEx APIs for showing, hiding, and configuring the window. Refactors window configuration to use WindowEx properties and AppWindow.TitleBar, removes obsolete using directives, and simplifies window sizing and positioning. This results in cleaner, more maintainable, and idiomatic WinUI code.
2025-12-17 10:48:36 +08:00
Yu Leng
e1c443628a Refactor window sizing to prevent flicker on show
Adjust window size to content before showing to avoid flicker and ensure correct initial appearance. Set minimal initial height to prevent "shrinking" effect. Remove redundant post-show resize logic and clarify intent with comments. Focus clearing is now performed immediately after showing the window.
2025-12-17 10:37:40 +08:00
Yu Leng
734ef8816b Refactor window positioning and sizing logic
Simplify and improve window positioning by using WinUIEx MonitorInfo to handle multi-monitor setups, taskbar positions, and DPI scaling. Remove manual DPI calculations and obsolete methods, making window sizing and placement more robust and concise.
2025-12-17 10:26:54 +08:00
Yu Leng
6d032713aa Fix window positioning to respect WorkArea X/Y offsets
Previously, window coordinates were calculated without considering the WorkArea's X and Y offsets, leading to incorrect placement on multi-monitor setups or when the taskbar is at the top or left. This update adds the WorkArea's X and Y values to the position calculations, ensuring accurate window placement across all display configurations.
2025-12-17 10:12:52 +08:00
Yu Leng
6acd859d43 Sync LightSwitch event names, add monitor refresh delay
- Use shared constants for LightSwitch theme event names in both C++ and C# to ensure cross-module consistency.
- Replace "Brightness update rate" with "Monitor refresh delay" setting in PowerDisplay; user can now configure delay (1–30s) after display changes before monitor refresh.
- Update UI and resources to reflect new setting and remove old references.
- MainViewModel now uses the configurable delay instead of a hardcoded value.
- Improves user control and reliability of monitor detection after hot-plug events.
2025-12-15 13:53:23 +08:00
Yu Leng
4f4a724d35 Add PowerDisplay asset support and logger name constant
Added PowerDisplay asset group to generateAllFileComponents.ps1 for file/component generation. Introduced powerDisplayLoggerName constant in LogSettings and updated PowerDisplayModule to use it for logger initialization, improving consistency.
2025-12-15 12:01:59 +08:00
Copilot
dcf1767c23 Refactor: Extract duplicated boolean-to-visibility converter to shared helper (#44236)
<!-- Enter a brief description/summary of your PR here. What does it
fix/what does it change/how was it tested (even manually, if necessary)?
-->
## Summary of the Pull Request

Eliminates code duplication by extracting the `ConvertBoolToVisibility`
method that was duplicated across `MonitorViewModel.cs` and
`MainWindow.xaml.cs` into a shared `VisibilityConverter` helper class.

<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist

- [ ] **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

<!-- Provide a more detailed description of the PR, other things fixed,
or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments

**Before:** Identical `ConvertBoolToVisibility` methods existed in two
places for x:Bind visibility conversions.

**After:** Single `VisibilityConverter.BoolToVisibility()` static method
in `Helpers/` namespace.

### Changes
- Created `PowerDisplay.Helpers.VisibilityConverter` with static
`BoolToVisibility` method
- Removed duplicate methods from `MonitorViewModel` and `MainWindow`
- Updated 8 XAML bindings to use
`helpers:VisibilityConverter.BoolToVisibility()`

Maintains AOT-compatible x:Bind pattern while eliminating duplication.

<!-- Describe how you validated the behavior. Add automated tests
wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed

Code review and security scan passed with no issues.

<!-- START COPILOT CODING AGENT TIPS -->
---

💬 We'd love your input! Share your thoughts on Copilot coding agent in
our [2 minute survey](https://gh.io/copilot-coding-agent-survey).

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: moooyo <42196638+moooyo@users.noreply.github.com>
2025-12-12 14:38:28 +08:00
Copilot
53a6d45056 Extract EnsureProcessRunning helper to eliminate code duplication (#44235)
## Summary of the Pull Request

Addresses code review feedback on #42642 by extracting duplicated
process launching logic into a reusable helper method.

## PR Checklist

- [ ] **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

The `ApplyColorTemperature` and `ApplyProfile` custom action handlers
contained identical 6-line blocks for process state checking, launching,
and synchronization.

**Changes:**
- Added `EnsureProcessRunning()` helper encapsulating the pattern: check
if running → launch if needed → wait for ready signal
- Replaced duplicated blocks in both handlers with single helper call

**Before:**
```cpp
if (!is_process_running())
{
    Logger::trace(L"PowerDisplay process not running, launching before applying...");
    launch_process();
    wait_for_process_ready();
}
```

**After:**
```cpp
EnsureProcessRunning();
```

## Validation Steps Performed

Code review and security checks passed.

<!-- START COPILOT CODING AGENT TIPS -->
---

💬 We'd love your input! Share your thoughts on Copilot coding agent in
our [2 minute survey](https://gh.io/copilot-coding-agent-survey).

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: moooyo <42196638+moooyo@users.noreply.github.com>
2025-12-12 14:27:10 +08:00
Yu Leng
ab1561bfc4 Update to use GetWindowLongPtr for 64-bit compatibility
Replaced all usages of GetWindowLong with GetWindowLongPtr and updated the P/Invoke declaration to use "GetWindowLongPtrW". This ensures correct window style handling on 64-bit Windows systems.
2025-12-12 14:25:49 +08:00
Yu Leng
39c10ad039 Update keywords, docs, and WMI controller imports
- Refreshed keyword lists in expect.txt to reflect recent changes.
- Fixed documentation link casing in design.md.
- Added Copilot attribution note to mccsParserDesign.md.
- Reordered and added using directives in WmiController.cs for clarity and dependency resolution.
2025-12-12 14:07:28 +08:00
Yu Leng
06a72f3c54 Refactor: update docs, diagrams, and PnpIdHelper namespace
- Improved PowerDisplay design docs for clarity and technical accuracy
- Rewrote DDC/CI section to better explain real-world issues
- Updated architecture diagrams and terminology (Helpers → Utils)
- Replaced ASCII diagrams with Mermaid for better visualization
- Clarified monitor identification and MST/Clone mode handling
- Corrected PnP Manufacturer ID attribution to UEFI Forum
- Moved PnpIdHelper.cs to Utils namespace and updated all references
2025-12-12 12:40:54 +08:00
Yu Leng
ef9c26dd50 Refactor CreateMonitorInfo to use object initializer
Refactored the CreateMonitorInfo method to use object initializer syntax instead of a parameterized constructor. This change improves code readability and maintainability, and removes the deprecated hardwareId parameter.
2025-12-12 11:14:50 +08:00
Yu Leng
f47abb43e9 Simplify color temp display names and VCP hex parsing
Refactored color temperature display name formatting to remove
hexadecimal values from user-facing strings, returning only the
preset or custom name. Updated fallback and custom value handling
to be more concise. Replaced the TryParseHexCode helper with
direct string slicing and parsing for VCP codes. Updated
documentation comments to match new formatting. These changes
improve code clarity and provide a cleaner UI.
2025-12-12 10:59:18 +08:00
Yu Leng
4557c509e5 Refactor logging and VCP naming; simplify capabilities status
Removed excessive debug/info logging and consolidated VCP code/value naming into a single VcpNames utility. Eliminated CapabilitiesStatus property in favor of simpler logic. Cleaned up exception handling and removed non-essential UI and service logs. No changes to core functionality.
2025-12-12 10:36:46 +08:00
Yu Leng
865dd60a83 Update expect.txt terms and fix NCP spelling in PnpIdHelper
Updated expect.txt with new and modified terms. Corrected the manufacturer name for "NCP" in PnpIdHelper.cs from "Najing CEC Panda" to "Nanjing CEC Panda" to fix a spelling error.
2025-12-11 13:18:00 +08:00
Yu Leng
2880b5afce Improve monitor orientation sync for mirror/clone mode
Refactor orientation tracking to use property change notifications in the Monitor model. Add GetCurrentOrientation to DisplayRotationService and a RefreshAllOrientations method in MonitorManager to ensure all monitors sharing a GdiDeviceName are updated after rotation. Update MonitorViewModel to subscribe to orientation changes and forward them to the UI, and clean up event subscriptions on dispose. These changes ensure accurate orientation state in both UI and data models, especially for mirrored displays.
2025-12-11 13:02:00 +08:00
Yu Leng
9a175df510 Improve WMI internal display naming and refresh logic
Enhance monitor discovery by extracting manufacturer IDs from WMI and mapping them to user-friendly names using a new PnpIdHelper. Remove unreliable WmiMonitorID name parsing. Add detailed logging and allow forced monitor refreshes during display changes. Update asset paths in project file for better organization.
2025-12-11 12:46:15 +08:00
Yu Leng
f07fa4db60 Improve monitor identification and display change handling
- Add detailed WMI monitor logging and fallback for missing names
- Update IdentifyWindow to support multi-monitor (mirrored) labels
- Map GDI device names to multiple monitor numbers for mirror mode
- Show pipe-separated monitor numbers in identify overlay
- Delay monitor refresh after display changes for hardware stability
- Enhance debug logging for monitor detection and mapping
2025-12-11 12:12:28 +08:00
Yu Leng
19eb78e696 Fix spelling issue 2025-12-11 11:18:09 +08:00
Yu Leng
ac94b3d9a5 Merge main into yuleng/display/pr/3
Resolve conflict in LightSwitchStateManager.cpp by keeping
NotifyPowerDisplay function for PowerDisplay integration.
2025-12-11 11:08:34 +08:00