Merge branch 'main' into copilot/fix-light-switch-gpo-issue

Co-authored-by: noraa-junker <58633848+noraa-junker@users.noreply.github.com>

src/common/GPOWrapperProjection/GPOWrapper.cs

@@ -66,5 +66,10 @@ namespace PowerToys.GPOWrapperProjection
         {
             return (GpoRuleConfigured)PowerToys.GPOWrapper.GPOWrapper.GetConfiguredWorkspacesEnabledValue();
         }
+
+        public static GpoRuleConfigured GetConfiguredLightSwitchEnabledValue()
+        {
+            return (GpoRuleConfigured)PowerToys.GPOWrapper.GPOWrapper.GetConfiguredLightSwitchEnabledValue();
+        }
     }
 }

src/settings-ui/Settings.UI/SettingsXAML/Views/LightSwitchPage.xaml.cs

@@ -50,8 +50,8 @@ namespace Microsoft.PowerToys.Settings.UI.Views
             var darkSettings = this.moduleSettingsRepository.SettingsConfig;
 
             // Pass them into the ViewModel
-            this.ViewModel = new LightSwitchViewModel(darkSettings, this.sendConfigMsg);
-            this.ViewModel.PropertyChanged += ViewModel_PropertyChanged;
+            ViewModel = new LightSwitchViewModel(_generalSettingsRepository, darkSettings, ShellPage.SendDefaultIPCMessage);
+            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}<EFBFBD>, {this.ViewModel.Longitude}<EFBFBD>";
+            this.ViewModel.SyncButtonInformation = $"{this.ViewModel.Latitude}°, {this.ViewModel.Longitude}°";
 
             var result = SunCalc.CalculateSunriseSunset(latitude, longitude, DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day);
 
@@ -293,18 +293,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
 
         private void UpdateEnabledState(bool recommendedState)
         {
-            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;
-            }
+            ViewModel.RefreshEnabledState();
         }
 
         private async void SyncLocationButton_Click(object sender, RoutedEventArgs e)

src/settings-ui/Settings.UI/ViewModels/LightSwitchViewModel.cs

@@ -10,10 +10,12 @@ using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Text.Json;
 using System.Windows.Input;
+using global::PowerToys.GPOWrapper;
 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 Settings.UI.Library;
@@ -27,10 +29,19 @@ 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(LightSwitchSettings initialSettings = null, Func<string, int> ipcMSGCallBackFunc = null)
+        public LightSwitchViewModel(ISettingsRepository<GeneralSettings> settingsRepository, LightSwitchSettings initialSettings = null, Func<string, int> ipcMSGCallBackFunc = null)
         {
+            // To obtain the general settings configurations of PowerToys Settings.
+            ArgumentNullException.ThrowIfNull(settingsRepository);
+
+            GeneralSettingsConfig = settingsRepository.SettingsConfig;
+
+            InitializeEnabledValue();
+
             _moduleSettings = initialSettings ?? new LightSwitchSettings();
             SendConfigMSG = ipcMSGCallBackFunc;
 
@@ -48,6 +59,21 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             _toggleThemeHotkey = _moduleSettings.Properties.ToggleThemeHotkey.Value;
         }
 
+        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;
+            }
+        }
+
         public override Dictionary<string, HotkeySettings[]> GetAllHotkeySettings()
         {
             var hotkeysDict = new Dictionary<string, HotkeySettings[]>
@@ -93,33 +119,26 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
 
         public bool IsEnabled
         {
-            get
-            {
-                if (_enabledStateIsGPOConfigured)
-                {
-                    return _enabledGPOConfiguration;
-                }
-                else
-                {
-                    return _isEnabled;
-                }
-            }
+            get => _isEnabled;
 
             set
             {
-                if (_isEnabled != value)
+                if (_enabledStateIsGPOConfigured)
                 {
-                    if (_enabledStateIsGPOConfigured)
-                    {
-                        // If it's GPO configured, shouldn't be able to change this state.
-                        return;
-                    }
+                    // If it's GPO configured, shouldn't be able to change this state.
+                    return;
+                }
 
+                if (value != _isEnabled)
+                {
                     _isEnabled = value;
 
-                    RefreshEnabledState();
+                    // Set the status in the general settings configuration
+                    GeneralSettingsConfig.Enabled.LightSwitch = value;
+                    OutGoingGeneralSettings snd = new OutGoingGeneralSettings(GeneralSettingsConfig);
 
-                    NotifyPropertyChanged();
+                    SendConfigMSG(snd.ToString());
+                    OnPropertyChanged(nameof(IsEnabled));
                 }
             }
         }
@@ -127,27 +146,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
         public bool IsEnabledGpoConfigured
         {
             get => _enabledStateIsGPOConfigured;
-            set
-            {
-                if (_enabledStateIsGPOConfigured != value)
-                {
-                    _enabledStateIsGPOConfigured = value;
-                    NotifyPropertyChanged();
-                }
-            }
-        }
-
-        public bool EnabledGPOConfiguration
-        {
-            get => _enabledGPOConfiguration;
-            set
-            {
-                if (_enabledGPOConfiguration != value)
-                {
-                    _enabledGPOConfiguration = value;
-                    NotifyPropertyChanged();
-                }
-            }
         }
 
         public string ScheduleMode
@@ -510,6 +508,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
 
         public void RefreshEnabledState()
         {
+            InitializeEnabledValue();
             OnPropertyChanged(nameof(IsEnabled));
         }
 
@@ -574,8 +573,8 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             }
         }
 
+        private GpoRuleConfigured _enabledGpoRuleConfiguration;
         private bool _enabledStateIsGPOConfigured;
-        private bool _enabledGPOConfiguration;
         private LightSwitchSettings _moduleSettings;
         private bool _isEnabled;
         private HotkeySettings _toggleThemeHotkey;