Force titlebar repaint when selecting theme or on Windows app theme c…

…hange
lay295 · May 23, 2024 · d9bd23f · d9bd23f
1 parent fe4d69d
commit d9bd23f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/TwitchDownloaderWPF/App.xaml.cs b/TwitchDownloaderWPF/App.xaml.cs
@@ -54,8 +54,8 @@ private static void CurrentDomain_UnhandledException(object sender, UnhandledExc
             Current?.Shutdown();
         }
 
-        public static void RequestAppThemeChange()
-            => ThemeServiceSingleton.ChangeAppTheme();
+        public static void RequestAppThemeChange(bool forceRepaint = false)
+            => ThemeServiceSingleton.ChangeAppTheme(forceRepaint);
 
         public static void RequestTitleBarChange()
             => ThemeServiceSingleton.SetTitleBarTheme(Current.Windows);

diff --git a/TwitchDownloaderWPF/Services/ThemeService.cs b/TwitchDownloaderWPF/Services/ThemeService.cs
@@ -66,11 +66,11 @@ private void WindowsThemeChanged(object sender, string newWindowsTheme)
 
             if (Settings.Default.GuiTheme.Equals("System", StringComparison.OrdinalIgnoreCase))
             {
-                ChangeAppTheme();
+                ChangeAppTheme(true);
             }
         }
 
-        public void ChangeAppTheme()
+        public void ChangeAppTheme(bool forceRepaint = false)
         {
             var newTheme = Settings.Default.GuiTheme;
             if (newTheme.Equals("System", StringComparison.OrdinalIgnoreCase))
@@ -87,6 +87,20 @@ public void ChangeAppTheme()
             {
                 SetTitleBarTheme(_wpfApplication.Windows);
             }
+
+            if (forceRepaint)
+            {
+                // Cause an NC repaint by changing focus
+                var wnd = new Window
+                {
+                    SizeToContent = SizeToContent.WidthAndHeight,
+                    Top = int.MinValue + 1,
+                    WindowStyle = WindowStyle.None,
+                    ShowInTaskbar = false
+                };
+                wnd.Show();
+                wnd.Close();
+            }
         }
 
         [SupportedOSPlatform("windows")]

diff --git a/TwitchDownloaderWPF/WindowSettings.xaml.cs b/TwitchDownloaderWPF/WindowSettings.xaml.cs
@@ -162,7 +162,7 @@ private void ComboTheme_OnSelectionChanged(object sender, SelectionChangedEventA
             {
                 _refreshThemeOnCancel = true;
                 Settings.Default.GuiTheme = (string)ComboTheme.SelectedItem;
-                App.RequestAppThemeChange();
+                App.RequestAppThemeChange(true);
             }
         }