FrmMain: sync dark/light theme with OS #434

d2phap · Feb 24, 2023 · 9390a68 · 9390a68
1 parent b507988
commit 9390a68
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/v9/Components/ImageGlass.UI/Forms/ModernForm.cs b/v9/Components/ImageGlass.UI/Forms/ModernForm.cs
@@ -436,12 +436,8 @@ private async Task TriggerRequestUpdatingColorModeEventAsync(CancellationToken t
             await Task.Delay(200, token);
             token.ThrowIfCancellationRequested();
 
-            var eventArgs = new SystemColorModeChangedEventArgs();
-            if (DarkMode != eventArgs.IsDarkMode)
-            {
-                // emit event here
-                OnRequestUpdatingColorMode(eventArgs);
-            }
+            // emit event here
+            OnRequestUpdatingColorMode(new SystemColorModeChangedEventArgs());
         }
         catch (OperationCanceledException) { }
     }

diff --git a/v9/ImageGlass/FrmMain/FrmMain.Theme.cs b/v9/ImageGlass/FrmMain/FrmMain.Theme.cs
@@ -100,13 +100,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);
+    }
 
 }