From a94d010a8d734fb791c39f3fd00bb22c3657243c Mon Sep 17 00:00:00 2001 From: Jaylyn Barbee <51131738+Jaylyn-Barbee@users.noreply.github.com> Date: Wed, 25 Feb 2026 10:44:15 -0500 Subject: [PATCH] [Light Switch] Fixed issue where Light switch could be toggled from the dashboard while GPO settings are active (#45756) ## Summary of the Pull Request Current behavior is that GPO policies are enforced on the Light Switch settings page but not on the dashboard or quick access menu's. This allows the user to still toggle Light Switch settings in scenarios where GPO is either forcing it to be enabled or disabled. This PR addresses that issue. ## PR Checklist - [x] Closes: #43754 ## Additional notes This PR only addresses issues on the dashboard page and in the quick access menu as described by https://github.com/microsoft/PowerToys/issues/43754. This PR also fixed an issue where modules were not showing in the Quick access menu when GPO is set to "Enabled" until you visited the module specific page. When modules are forced enabled, they should appear in Quick Access upon launch if they have a quick access entry. This issue does not address issue https://github.com/microsoft/PowerToys/issues/42484 which was fixed with the PR https://github.com/microsoft/PowerToys/pull/44567 ## Validation Steps Performed Tested locally, photos below Not configured: image Enabled: image Disabled: image We can observe the option being locked on the quick toggles and not present in the quick access menu when disabled. --- src/settings-ui/QuickAccess.UI/Helpers/ModuleGpoHelper.cs | 1 + .../QuickAccess.UI/ViewModels/LauncherViewModel.cs | 1 + .../QuickAccess/QuickAccessViewModel.cs | 7 +++++-- src/settings-ui/Settings.UI/Helpers/ModuleGpoHelper.cs | 1 + .../Settings.UI/ViewModels/DashboardViewModel.cs | 1 + 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/settings-ui/QuickAccess.UI/Helpers/ModuleGpoHelper.cs b/src/settings-ui/QuickAccess.UI/Helpers/ModuleGpoHelper.cs index 25f32e191b..e638222d93 100644 --- a/src/settings-ui/QuickAccess.UI/Helpers/ModuleGpoHelper.cs +++ b/src/settings-ui/QuickAccess.UI/Helpers/ModuleGpoHelper.cs @@ -28,6 +28,7 @@ internal static class ModuleGpoHelper ModuleType.Hosts => GPOWrapper.GetConfiguredHostsFileEditorEnabledValue(), ModuleType.ImageResizer => GPOWrapper.GetConfiguredImageResizerEnabledValue(), ModuleType.KeyboardManager => GPOWrapper.GetConfiguredKeyboardManagerEnabledValue(), + ModuleType.LightSwitch => GPOWrapper.GetConfiguredLightSwitchEnabledValue(), ModuleType.MouseHighlighter => GPOWrapper.GetConfiguredMouseHighlighterEnabledValue(), ModuleType.MouseJump => GPOWrapper.GetConfiguredMouseJumpEnabledValue(), ModuleType.MousePointerCrosshairs => GPOWrapper.GetConfiguredMousePointerCrosshairsEnabledValue(), diff --git a/src/settings-ui/QuickAccess.UI/ViewModels/LauncherViewModel.cs b/src/settings-ui/QuickAccess.UI/ViewModels/LauncherViewModel.cs index afc6522332..617a5402ae 100644 --- a/src/settings-ui/QuickAccess.UI/ViewModels/LauncherViewModel.cs +++ b/src/settings-ui/QuickAccess.UI/ViewModels/LauncherViewModel.cs @@ -40,6 +40,7 @@ public sealed class LauncherViewModel : Observable _settingsRepository, new Microsoft.PowerToys.QuickAccess.Services.QuickAccessLauncher(_coordinator), moduleType => Helpers.ModuleGpoHelper.GetModuleGpoConfiguration(moduleType) == GpoRuleConfigured.Disabled, + moduleType => Helpers.ModuleGpoHelper.GetModuleGpoConfiguration(moduleType) == GpoRuleConfigured.Enabled, _resourceLoader); var updatingSettings = UpdatingSettings.LoadSettings() ?? new UpdatingSettings(); IsUpdateAvailable = updatingSettings.State is UpdatingSettings.UpdatingState.ReadyToInstall or UpdatingSettings.UpdatingState.ReadyToDownload; diff --git a/src/settings-ui/Settings.UI.Controls/QuickAccess/QuickAccessViewModel.cs b/src/settings-ui/Settings.UI.Controls/QuickAccess/QuickAccessViewModel.cs index 2fb626869d..004f554640 100644 --- a/src/settings-ui/Settings.UI.Controls/QuickAccess/QuickAccessViewModel.cs +++ b/src/settings-ui/Settings.UI.Controls/QuickAccess/QuickAccessViewModel.cs @@ -19,6 +19,7 @@ namespace Microsoft.PowerToys.Settings.UI.Controls private readonly ISettingsRepository _settingsRepository; private readonly IQuickAccessLauncher _launcher; private readonly Func _isModuleGpoDisabled; + private readonly Func _isModuleGpoEnabled; private readonly ResourceLoader _resourceLoader; private readonly DispatcherQueue _dispatcherQueue; private GeneralSettings _generalSettings; @@ -29,11 +30,13 @@ namespace Microsoft.PowerToys.Settings.UI.Controls ISettingsRepository settingsRepository, IQuickAccessLauncher launcher, Func isModuleGpoDisabled, + Func isModuleGpoEnabled, ResourceLoader resourceLoader) { _settingsRepository = settingsRepository; _launcher = launcher; _isModuleGpoDisabled = isModuleGpoDisabled; + _isModuleGpoEnabled = isModuleGpoEnabled; _resourceLoader = resourceLoader; _dispatcherQueue = DispatcherQueue.GetForCurrentThread(); @@ -85,7 +88,7 @@ namespace Microsoft.PowerToys.Settings.UI.Controls { Title = _resourceLoader.GetString(Microsoft.PowerToys.Settings.UI.Library.Helpers.ModuleHelper.GetModuleLabelResourceName(moduleType)), Tag = moduleType, - Visible = Microsoft.PowerToys.Settings.UI.Library.Helpers.ModuleHelper.GetIsModuleEnabled(_generalSettings, moduleType), + Visible = _isModuleGpoEnabled(moduleType) || Microsoft.PowerToys.Settings.UI.Library.Helpers.ModuleHelper.GetIsModuleEnabled(_generalSettings, moduleType), Description = GetModuleToolTip(moduleType), Icon = Microsoft.PowerToys.Settings.UI.Library.Helpers.ModuleHelper.GetModuleTypeFluentIconName(moduleType), Command = new RelayCommand(() => _launcher.Launch(moduleType)), @@ -111,7 +114,7 @@ namespace Microsoft.PowerToys.Settings.UI.Controls { if (item.Tag is ModuleType moduleType) { - item.Visible = Microsoft.PowerToys.Settings.UI.Library.Helpers.ModuleHelper.GetIsModuleEnabled(_generalSettings, moduleType); + item.Visible = _isModuleGpoEnabled(moduleType) || Microsoft.PowerToys.Settings.UI.Library.Helpers.ModuleHelper.GetIsModuleEnabled(_generalSettings, moduleType); } } } diff --git a/src/settings-ui/Settings.UI/Helpers/ModuleGpoHelper.cs b/src/settings-ui/Settings.UI/Helpers/ModuleGpoHelper.cs index 18a17937dc..74c044db26 100644 --- a/src/settings-ui/Settings.UI/Helpers/ModuleGpoHelper.cs +++ b/src/settings-ui/Settings.UI/Helpers/ModuleGpoHelper.cs @@ -30,6 +30,7 @@ namespace Microsoft.PowerToys.Settings.UI.Helpers case ModuleType.Hosts: return GPOWrapper.GetConfiguredHostsFileEditorEnabledValue(); case ModuleType.ImageResizer: return GPOWrapper.GetConfiguredImageResizerEnabledValue(); case ModuleType.KeyboardManager: return GPOWrapper.GetConfiguredKeyboardManagerEnabledValue(); + case ModuleType.LightSwitch: return GPOWrapper.GetConfiguredLightSwitchEnabledValue(); case ModuleType.MouseHighlighter: return GPOWrapper.GetConfiguredMouseHighlighterEnabledValue(); case ModuleType.MouseJump: return GPOWrapper.GetConfiguredMouseJumpEnabledValue(); case ModuleType.MousePointerCrosshairs: return GPOWrapper.GetConfiguredMousePointerCrosshairsEnabledValue(); diff --git a/src/settings-ui/Settings.UI/ViewModels/DashboardViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/DashboardViewModel.cs index 6301465996..3fa6f37097 100644 --- a/src/settings-ui/Settings.UI/ViewModels/DashboardViewModel.cs +++ b/src/settings-ui/Settings.UI/ViewModels/DashboardViewModel.cs @@ -124,6 +124,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels _settingsRepository, new Microsoft.PowerToys.Settings.UI.Controls.QuickAccessLauncher(App.IsElevated), moduleType => Helpers.ModuleGpoHelper.GetModuleGpoConfiguration(moduleType) == global::PowerToys.GPOWrapper.GpoRuleConfigured.Disabled, + moduleType => Helpers.ModuleGpoHelper.GetModuleGpoConfiguration(moduleType) == global::PowerToys.GPOWrapper.GpoRuleConfigured.Enabled, resourceLoader); BuildModuleList();