Fix a bug that when loading new style, old one will have leftover

LEOYoon-Tsaw · May 18, 2024 · e6cf350 · e6cf350
1 parent 7869556
commit e6cf350
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/Squirrel.xcodeproj/project.pbxproj b/Squirrel.xcodeproj/project.pbxproj
@@ -592,7 +592,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.99.4;
+				CURRENT_PROJECT_VERSION = 0.99.5;
 				DEAD_CODE_STRIPPING = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -648,7 +648,7 @@
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 0.99.4;
+				CURRENT_PROJECT_VERSION = 0.99.5;
 				DEAD_CODE_STRIPPING = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

diff --git a/sources/SquirrelPanel.swift b/sources/SquirrelPanel.swift
@@ -285,8 +285,13 @@ final class SquirrelPanel: NSPanel {
   }
 
   func load(config: SquirrelConfig, forDarkMode isDark: Bool) {
-    let theme = isDark ? view.darkTheme : view.lightTheme
-    theme.load(config: config, dark: isDark)
+    if isDark {
+      view.darkTheme = SquirrelTheme()
+      view.darkTheme.load(config: config, dark: true)
+    } else {
+      view.lightTheme = SquirrelTheme()
+      view.lightTheme.load(config: config, dark: isDark)
+    }
   }
 }