refactor: improve theme update logic and clean up code

Author: trgiangv

source/RevitDevTool/Theme/Win32DarkMode.cs

@@ -1,22 +1,22 @@
-namespace RevitDevTool.Theme ;
+namespace RevitDevTool.Theme;
 
 internal static class Win32DarkMode
 {
-    private const int DarkModeBefore20H1 = 19 ;
-    private const int DarkMode = 20 ;
-    
+    private const int DarkModeBefore20H1 = 19;
+    private const int DarkMode = 20;
+
     [System.Runtime.InteropServices.DllImport("dwmapi.dll", CharSet = System.Runtime.InteropServices.CharSet.Unicode, SetLastError = true)]
     private static extern int DwmSetWindowAttribute(IntPtr hwnd, int attr, ref int attrValue, int attrSize);
 
     [System.Runtime.InteropServices.DllImport("uxtheme.dll", CharSet = System.Runtime.InteropServices.CharSet.Unicode, SetLastError = true)]
     private static extern int SetWindowTheme(IntPtr hWnd, string? pszSubAppName, string? pszSubIdList);
 
-    public static void SetImmersiveDarkMode( IntPtr hwnd, bool enable )
+    public static void SetImmersiveDarkMode(IntPtr hwnd, bool isDark)
     {
-        if ( hwnd == IntPtr.Zero ) return ;
-        var useDark = enable ? 1 : 0 ;
-        _ = DwmSetWindowAttribute( hwnd, DarkMode, ref useDark, sizeof( int ) ) ;
-        _ = DwmSetWindowAttribute( hwnd, DarkModeBefore20H1, ref useDark, sizeof( int ) ) ;
-        SetWindowTheme( hwnd, enable ? "DarkMode_Explorer" : "Explorer", null ) ;
+        if (hwnd == IntPtr.Zero) return;
+        var useDark = isDark ? 1 : 0;
+        _ = SetWindowTheme(hwnd, isDark ? "DarkMode_Explorer" : "Explorer", null);
+        _ = DwmSetWindowAttribute(hwnd, DarkMode, ref useDark, sizeof(int));
+        _ = DwmSetWindowAttribute(hwnd, DarkModeBefore20H1, ref useDark, sizeof(int));
     }
 }

source/RevitDevTool/ViewModel/TraceLogViewModel.cs

@@ -32,13 +32,13 @@ internal partial class TraceLogViewModel : ObservableObject, IDisposable
 
     public WindowsFormsHost LogTextBox { get; }
 
-    [ObservableProperty] [NotifyCanExecuteChangedFor(nameof(OpenSettingsCommand))] 
+    [ObservableProperty] 
+    [NotifyCanExecuteChangedFor(nameof(OpenSettingsCommand))] 
     private bool _isSettingOpened;
 
     [ObservableProperty] 
     private bool _isStarted = true;
 
-    [ObservableProperty] 
     private bool _isSubcribe;
 
     [ObservableProperty] 
@@ -127,19 +127,26 @@ private void ApplyTextBoxTheme()
         _winFormsTextBox.BackColor = isDark
             ? System.Drawing.Color.FromArgb(30, 30, 30) 
             : System.Drawing.Color.FromArgb(250, 250, 250);
-        
-        Win32DarkMode.SetImmersiveDarkMode(_winFormsTextBox.Handle, isDark);
+
+        if (_winFormsTextBox.Handle != IntPtr.Zero)
+        {
+            Win32DarkMode.SetImmersiveDarkMode(_winFormsTextBox.Handle, isDark);
+        }
     }
 
     private void OnThemeChanged(ApplicationTheme theme, System.Windows.Media.Color accent)
     {
         if (_currentTheme == theme) return;
-        
+        UpdateTheme(theme, IsStarted);
+    }
+
+    private void UpdateTheme(ApplicationTheme theme, bool shouldRestart)
+    {
         LogTextBox.Dispatcher.Invoke(() =>
         {
             _currentTheme = theme;
             ApplyTextBoxTheme();
-            if (IsStarted)
+            if (shouldRestart)
             {
                 RestartLogging();
             }
@@ -156,29 +163,27 @@ private void RestartLogging()
 
     public void Subcribe()
     {
-        if (IsSubcribe) return;
+        if (_isSubcribe) return;
 
-        Debug.WriteLine("TraceLogViewModel Subscribe");
+        _consoleRedirector ??= new ConsoleRedirector();
 
+        UpdateTheme(ThemeWatcher.GetRequiredTheme(), true);
         IsStarted = true;
-        _consoleRedirector ??= new ConsoleRedirector();
 
         Context.UiApplication.Idling += _onIdlingHandler;
         ApplicationThemeManager.Changed += _onThemeChangedHandler;
 
-        IsSubcribe = true;
+        _isSubcribe = true;
     }
 
     private void Unsubscribe()
     {
-        if (!IsSubcribe) return;
-        
-        Debug.WriteLine("TraceLogViewModel Unsubscribe");
-        
+        if (!_isSubcribe) return;
+
         Context.UiApplication.Idling -= _onIdlingHandler;
         ApplicationThemeManager.Changed -= _onThemeChangedHandler;
-        
-        IsSubcribe = false;
+
+        _isSubcribe = false;
     }
 
     private void OnIdling(object? sender, IdlingEventArgs e)
@@ -206,13 +211,17 @@ public TraceLogViewModel()
             Child = _winFormsTextBox
         };
 
+        LogTextBox.Loaded += (_, _) =>
+        {
+            ApplyTextBoxTheme();
+        };
+
         PresentationTraceSources.ResourceDictionarySource.Switch.Level = SourceLevels.Critical;
         _levelSwitch = new LoggingLevelSwitch(_logLevel);
         _onThemeChangedHandler = OnThemeChanged;
         _onIdlingHandler = OnIdling;
         _currentTheme = ThemeWatcher.GetRequiredTheme();
 
-        ApplyTextBoxTheme();
         Subcribe();
         StartTracing();
     }
@@ -238,22 +247,22 @@ private void OpenSettings()
         settingsWindow.Show();
         settingsWindow.NavigationService.Navigate(typeof(GeneralSettingsView));
         IsSettingOpened = true;
-        settingsWindow.Closed += (_, _) => { IsSettingOpened = false ; };
+        settingsWindow.Closed += (_, _) => { IsSettingOpened = false; };
     }
 
     private bool CanOpenSettings() => !IsSettingOpened;
 
     public void Dispose()
     {
         Debug.WriteLine("TraceLogViewModel Dispose");
-        
+
         IsStarted = false;
         StopTracing();
         Unsubscribe();
-        
+
         _consoleRedirector?.Dispose();
         _consoleRedirector = null;
-        
+
         GC.SuppressFinalize(this);
     }
 }