Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-05 02:36:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "[Light Switch] Switch desktop wallpapers with the Light/Dark mode" (#44588)

Browse Source 
This uses IVirtualDesktopManagerInternal*, which is an undocumented
Windows Shell internal API.
These interfaces are not stable and can change across Windows updates,
so using them in PowerToys carries some long-term risk
This commit is contained in:
Kai Tao
2026-01-08 10:14:43 +08:00
committed by GitHub
parent 08d4689ec5
commit 9c58574484
25 changed files with 310 additions and 1118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

231
src/settings-ui/Settings.UI/ViewModels/LightSwitchViewModel.cs
View File

@@ -5,9 +5,7 @@
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Text.Json;
@@ -17,12 +15,9 @@ using Microsoft.PowerToys.Settings.UI.Helpers;
using Microsoft.PowerToys.Settings.UI.Library;
using Microsoft.PowerToys.Settings.UI.Library.Helpers;
using Microsoft.PowerToys.Settings.UI.SerializationContext;
using Microsoft.UI.Xaml.Media;
using Microsoft.UI.Xaml.Media.Imaging;
using Newtonsoft.Json.Linq;
using Settings.UI.Library;
using Settings.UI.Library.Helpers;
using Windows.Storage;
namespace Microsoft.PowerToys.Settings.UI.ViewModels
{
@@ -51,7 +46,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
};
_toggleThemeHotkey = _moduleSettings.Properties.ToggleThemeHotkey.Value;
PropertyChanged += WallpaperPath_Changed;
}
public override Dictionary<string, HotkeySettings[]> GetAllHotkeySettings()
@@ -530,11 +524,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
OnPropertyChanged(nameof(Latitude));
OnPropertyChanged(nameof(Longitude));
OnPropertyChanged(nameof(ScheduleMode));
OnPropertyChanged(nameof(IsWallpaperEnabled));
OnPropertyChanged(nameof(WallpaperPathLight));
OnPropertyChanged(nameof(WallpaperPathDark));
OnPropertyChanged(nameof(WallpaperStyleLight));
OnPropertyChanged(nameof(WallpaperStyleDark));
}
private void UpdateSunTimes(double latitude, double longitude, string city = "n/a")
@@ -585,222 +574,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
}
}
public bool IsWallpaperEnabled
{
get
{
return ModuleSettings.Properties.WallpaperEnabled.Value;
}
set
{
if (ModuleSettings.Properties.WallpaperEnabled.Value != value)
{
ModuleSettings.Properties.WallpaperEnabled.Value = value;
NotifyPropertyChanged();
}
}
}
public bool IsVirtualDesktopEnabled
{
get
{
return ModuleSettings.Properties.WallpaperVirtualDesktopEnabled.Value;
}
set
{
if (ModuleSettings.Properties.WallpaperVirtualDesktopEnabled.Value != value)
{
ModuleSettings.Properties.WallpaperVirtualDesktopEnabled.Value = value;
NotifyPropertyChanged();
}
}
}
public string WallpaperPathLight
{
get
{
return ModuleSettings.Properties.WallpaperPathLight.Value;
}
set
{
if (ModuleSettings.Properties.WallpaperPathLight.Value != value)
{
ModuleSettings.Properties.WallpaperPathLight.Value = value;
NotifyPropertyChanged();
}
}
}
public string WallpaperPathDark
{
get
{
return ModuleSettings.Properties.WallpaperPathDark.Value;
}
set
{
if (ModuleSettings.Properties.WallpaperPathDark.Value != value)
{
ModuleSettings.Properties.WallpaperPathDark.Value = value;
NotifyPropertyChanged();
}
}
}
public bool IsLightWallpaperValid
{
get => _isLightWallpaperValid;
set
{
if (_isLightWallpaperValid != value)
{
_isLightWallpaperValid = value;
}
}
}
public bool IsDarkWallpaperValid
{
get => _isDarkWallpaperValid;
set
{
if (_isDarkWallpaperValid != value)
{
_isDarkWallpaperValid = value;
}
}
}
public ImageSource WallpaperSourceLight
{
get => _wallpaperSourceLight;
set
{
if (_wallpaperSourceLight != value)
{
_wallpaperSourceLight = value;
NotifyPropertyChanged();
}
}
}
public ImageSource WallpaperSourceDark
{
get => _wallpaperSourceDark;
set
{
if (_wallpaperSourceDark != value)
{
_wallpaperSourceDark = value;
NotifyPropertyChanged();
}
}
}
public int WallpaperStyleLight
{
get => ModuleSettings.Properties.WallpaperStyleLight.Value;
set
{
if (ModuleSettings.Properties.WallpaperStyleLight.Value != value)
{
ModuleSettings.Properties.WallpaperStyleLight.Value = value;
NotifyPropertyChanged();
}
}
}
public int WallpaperStyleDark
{
get => ModuleSettings.Properties.WallpaperStyleDark.Value;
set
{
if (ModuleSettings.Properties.WallpaperStyleDark.Value != value)
{
ModuleSettings.Properties.WallpaperStyleDark.Value = value;
NotifyPropertyChanged();
}
}
}
public static void DeleteFile(string path)
{
// Prevent attackers from damaging files through specially crafted JSON
var dataPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "\\Microsoft\\PowerToys\\LightSwitch";
if (!string.IsNullOrEmpty(path) && path.StartsWith(dataPath, StringComparison.OrdinalIgnoreCase))
{
try
{
File.Delete(path);
}
catch (Exception)
{
}
}
}
private async void WallpaperPath_Changed(object sender, PropertyChangedEventArgs e)
{
if (e.PropertyName == nameof(WallpaperPathLight))
{
var lightImage = new BitmapImage();
try
{
var lightFile = await StorageFile.GetFileFromPathAsync(WallpaperPathLight);
await lightImage.SetSourceAsync(await lightFile.OpenReadAsync()); // thrown here when the image is invalid
WallpaperSourceLight = lightImage;
IsLightWallpaperValid = true;
}
catch (Exception)
{
DeleteFile(WallpaperPathLight);
WallpaperPathLight = null;
IsLightWallpaperValid = false;
WallpaperSourceLight = null;
IsWallpaperEnabled = false;
}
}
else if (e.PropertyName == nameof(WallpaperPathDark))
{
var darkImage = new BitmapImage();
try
{
var darkFile = await StorageFile.GetFileFromPathAsync(WallpaperPathDark);
await darkImage.SetSourceAsync(await darkFile.OpenReadAsync());
WallpaperSourceDark = darkImage;
IsDarkWallpaperValid = true;
}
catch (Exception)
{
DeleteFile(WallpaperPathDark);
WallpaperPathDark = null;
IsDarkWallpaperValid = false;
WallpaperSourceDark = null;
IsWallpaperEnabled = false;
}
}
}
private int GetRegistryBuildNumber()
{
var value = Win32.Registry.GetValue("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", "CurrentBuildNumber", string.Empty);
#pragma warning disable CA1305
return int.Parse(value as string);
#pragma warning restore CA1305
}
public bool Is24H2OrLater
{
get => GetRegistryBuildNumber() > 26100;
}
private bool _enabledStateIsGPOConfigured;
private bool _enabledGPOConfiguration;
private LightSwitchSettings _moduleSettings;
@@ -808,10 +581,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
private HotkeySettings _toggleThemeHotkey;
private TimeSpan? _sunriseTimeSpan;
private TimeSpan? _sunsetTimeSpan;
private bool _isLightWallpaperValid;
private bool _isDarkWallpaperValid;
private ImageSource _wallpaperSourceLight;
private ImageSource _wallpaperSourceDark;
public ICommand ForceLightCommand { get; }