v3.8.0

Pearcleaner/Logic/Styles.swift

@@ -962,10 +962,10 @@ struct PickerModifier: ViewModifier {
         content
             .buttonStyle(.borderless)
             .padding(4)
-            .background {
-                backgroundView(themeSettings: themeSettings, darker: isHovered)
-                    .clipShape(RoundedRectangle(cornerRadius: 10))
-            }
+//            .background {
+//                backgroundView(themeSettings: themeSettings, darker: isHovered)
+//                    .clipShape(RoundedRectangle(cornerRadius: 10))
+//            }
             .onHover { hovering in
                 isHovered = hovering
             }
@@ -995,7 +995,7 @@ struct PresetColor: ButtonStyle {
                 .help(label)
                 .overlay(
                     RoundedRectangle(cornerRadius: 25)
-                        .strokeBorder(Color("mode").opacity(0.8), lineWidth: 1.5))
+                        .strokeBorder(Color("mode").opacity(0.8), lineWidth: 1))
 //            Text(label)
         }
         .onHover { inside in inside ? NSCursor.pointingHand.push() : NSCursor.pop() }

Pearcleaner/Logic/ThemeManager.swift

@@ -28,14 +28,14 @@ class ThemeSettings: ObservableObject {
         themeColor = userDefaults.color(forKey: colorKey) ?? .clear
     }
 
-    func setupInitialColor() {
-        if userDefaults.color(forKey: colorKey) == nil {
-            // Only set the initial color if it has not been set by the user.
-            let darkMode = isDarkMode()  // Safe to call here after the application is fully set up.
-            themeColor = darkMode ? Color(.sRGB, red: 0.188143, green: 0.208556, blue: 0.262679, opacity: 1) :
-            Color(.sRGB, red: 1.0, green: 1.0, blue: 1.0, opacity: 1)
-            saveThemeColor()
-        }
+    func setupInitialColor(forcedDarkMode: Bool? = nil) {
+        // Determine dark mode either from forced setting or system setting
+        let darkMode = forcedDarkMode ?? isDarkMode()
+
+        // Set the theme color based on the dark mode status
+        themeColor = darkMode ? Color(.sRGB, red: 0.188143, green: 0.208556, blue: 0.262679, opacity: 1) :
+        Color(.sRGB, red: 1.0, green: 1.0, blue: 1.0, opacity: 1)
+        saveThemeColor()
     }
 
     private func loadThemeColor() {