FrmSlideshow, FrmExportFrames: sync dark/light theme with OS

#434
d2phap · Feb 24, 2023 · 32981ed · 32981ed
1 parent 4fedc09
commit 32981ed
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 12 deletions.
diff --git a/v9/Components/ImageGlass.Settings/Config.cs b/v9/Components/ImageGlass.Settings/Config.cs
@@ -1116,6 +1116,12 @@ public static void LoadThemePack(bool darkMode, bool useFallBackTheme, bool thro
             themeFolderName = Constants.DEFAULT_THEME;
         }
 
+        // theme pack is already updated
+        if (themeFolderName.Equals(Theme.FolderName, StringComparison.InvariantCultureIgnoreCase))
+        {
+            return;
+        }
+
         var th = new IgTheme(App.ConfigDir(PathType.Dir, Dir.Themes, themeFolderName));
 
         if (!th.IsValid)

diff --git a/v9/Utilities/igcmd/FrmExportFrames.cs b/v9/Utilities/igcmd/FrmExportFrames.cs
@@ -89,13 +89,13 @@ protected override void ApplyTheme(bool darkMode, BackdropStyle? style = null)
     }
 
 
-    //protected override void OnRequestUpdatingColorMode(SystemColorModeChangedEventArgs e)
-    //{
-    //    // update theme here
-    //    ApplyTheme(e.IsDarkMode);
+    protected override void OnRequestUpdatingColorMode(SystemColorModeChangedEventArgs e)
+    {
+        // theme mode is changed, need to load the corresponding theme pack
+        Config.LoadThemePack(e.IsDarkMode, true, true);
 
-    //    base.OnRequestUpdatingColorMode(e);
-    //}
+        base.OnRequestUpdatingColorMode(e);
+    }
 
 
     protected override int OnUpdateHeight(bool performUpdate = true)

diff --git a/v9/Utilities/igcmd/Slideshow/FrmSlideshow.cs b/v9/Utilities/igcmd/Slideshow/FrmSlideshow.cs
@@ -180,13 +180,19 @@ protected override void OnSystemAccentColorChanged(SystemAccentColorChangedEvent
     }
 
 
-    //protected override void OnRequestUpdatingColorMode(SystemColorModeChangedEventArgs e)
-    //{
-    //    // update theme here
-    //    ApplyTheme(e.IsDarkMode);
+    protected override void OnRequestUpdatingColorMode(SystemColorModeChangedEventArgs e)
+    {
+        // theme mode is changed, need to load the corresponding theme pack
+        Config.LoadThemePack(e.IsDarkMode, true, true);
+
+        // load the theme icons
+        OnDpiChanged();
 
-    //    base.OnRequestUpdatingColorMode(e);
-    //}
+        // apply theme to controls
+        ApplyTheme(Config.Theme.Settings.IsDarkMode);
+
+        base.OnRequestUpdatingColorMode(e);
+    }
 
 
     protected override void OnDpiChanged()