From 9390a686d921e765212abf2aab0b35ecd660bd27 Mon Sep 17 00:00:00 2001
From: Phap Dieu Duong <ddphap@gmail.com>
Date: Fri, 24 Feb 2023 21:53:44 +0800
Subject: [PATCH] FrmMain: sync dark/light theme with OS #434

---
 .../ImageGlass.UI/Forms/ModernForm.cs          |  8 ++------
 v9/ImageGlass/FrmMain/FrmMain.Theme.cs         | 18 ++++++++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/v9/Components/ImageGlass.UI/Forms/ModernForm.cs b/v9/Components/ImageGlass.UI/Forms/ModernForm.cs
index a8af9edd6..c4efbf28a 100644
--- 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
index ad2c548c9..92cae58ed 100644
--- 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);
+    }
 
 }