fix global wallpaper not applying correctly (#805, #800)

AutoDarkMode · Jan 9, 2024 · 0f69a97 · 0f69a97
1 parent 776a22f
commit 0f69a97
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 8 deletions.
diff --git a/AutoDarkModeSvc/AutoDarkModeSvc.csproj b/AutoDarkModeSvc/AutoDarkModeSvc.csproj
@@ -5,7 +5,7 @@
     <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
     <UseWindowsForms>true</UseWindowsForms>
-    <Version>10.4.2.3</Version>
+    <Version>10.4.2.4</Version>
     <AssemblyName>AutoDarkModeSvc</AssemblyName>
     <ApplicationIcon>..\adm_tray_new.ico</ApplicationIcon>
     <StartupObject>AutoDarkModeSvc.Program</StartupObject>

diff --git a/AutoDarkModeSvc/SwitchComponents/Base/WallpaperSwitch.cs b/AutoDarkModeSvc/SwitchComponents/Base/WallpaperSwitch.cs
@@ -79,7 +79,7 @@ protected bool TypeNeedsUpdate(WallpaperType type, Theme targetTheme)
             }
             else if (type == WallpaperType.Global && currentGlobalTheme != targetTheme)
             {
-                HookPosition = HookPosition.PreSync;
+                HookPosition = HookPosition.PostSync;
                 return true;
             }
             else if (type == WallpaperType.Spotlight)
@@ -196,15 +196,12 @@ protected void HandleSwitchByType(WallpaperType type, Theme newTheme)
             }
             else if (type == WallpaperType.Global)
             {
-                WallpaperHandler.SetGlobalWallpaper(Settings.Component.GlobalWallpaper, newTheme);
-                currentGlobalTheme = newTheme;
-                currentIndividualTheme = Theme.Unknown;
-                currentSolidColorTheme = Theme.Unknown;
-                spotlightEnabled = false;
-
+                SwitchGlobal(newTheme);
             }
             else if (type == WallpaperType.All)
             {
+                Logger.Error("not implemented anymore");
+                /*
                 bool globalSwitched = false;
                 if (currentGlobalTheme != newTheme)
                 {
@@ -219,6 +216,7 @@ protected void HandleSwitchByType(WallpaperType type, Theme newTheme)
                 currentIndividualTheme = newTheme;
                 currentSolidColorTheme = Theme.Unknown;
                 spotlightEnabled = false;
+                */
             }
             else if (type == WallpaperType.SolidColor)
             {
@@ -235,6 +233,15 @@ protected void HandleSwitchByType(WallpaperType type, Theme newTheme)
             }
         }
 
+        protected virtual void SwitchGlobal(Theme newTheme)
+        {
+            WallpaperHandler.SetGlobalWallpaper(Settings.Component.GlobalWallpaper, newTheme);
+            currentGlobalTheme = newTheme;
+            currentIndividualTheme = Theme.Unknown;
+            currentSolidColorTheme = Theme.Unknown;
+            spotlightEnabled = false;
+        } 
+
         protected virtual void SwitchIndividual(Theme newTheme)
         {
             WallpaperHandler.SetWallpapers(Settings.Component.Monitors, Settings.Component.Position, newTheme);

diff --git a/AutoDarkModeSvc/SwitchComponents/Base/WallpaperSwitchThemeFile.cs b/AutoDarkModeSvc/SwitchComponents/Base/WallpaperSwitchThemeFile.cs
@@ -52,6 +52,25 @@ protected override void SwitchSolidColor(Theme newTheme)
             currentIndividualTheme = Theme.Unknown;
             spotlightEnabled = false;
         }
+
+        protected override void SwitchGlobal(Theme newTheme)
+        {
+            WallpaperHandler.SetGlobalWallpaper(Settings.Component.GlobalWallpaper, newTheme);
+            if (newTheme == Theme.Light)
+            {
+                GlobalState.ManagedThemeFile.Desktop.Wallpaper = Settings.Component.GlobalWallpaper.Light;
+            }
+            else
+            {
+                GlobalState.ManagedThemeFile.Desktop.Wallpaper = Settings.Component.GlobalWallpaper.Dark;
+            }
+            GlobalState.ManagedThemeFile.Desktop.MultimonBackgrounds = 0;
+            currentGlobalTheme = newTheme;
+            currentIndividualTheme = Theme.Unknown;
+            currentSolidColorTheme = Theme.Unknown;
+            spotlightEnabled = false;
+        }
+
         protected override bool SolidColorNeedsUpdateHandler()
         {
             HookPosition = HookPosition.PostSync;