fix: color panel fixes

superhighfives · Dec 21, 2024 · 1863be7 · 1863be7
1 parent 5752670
commit 1863be7
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 15 deletions.
diff --git a/Pika/Utilities/Eyedroppers.swift b/Pika/Utilities/Eyedroppers.swift
@@ -97,6 +97,8 @@ class Eyedropper: ObservableObject {
         panel.titleVisibility = .visible
         panel.setTarget(self)
         panel.color = color
+        panel.mode = .RGB
+        panel.colorSpace = Defaults[.colorSpace]
         panel.orderFrontRegardless()
         panel.setAction(#selector(colorDidChange))
         panel.isContinuous = true

diff --git a/Pika/Views/EyedropperItem.swift b/Pika/Views/EyedropperItem.swift
@@ -36,7 +36,12 @@ struct EyedropperItem: View {
             .onReceive(NotificationCenter.default.publisher(
                 for: Notification.Name("triggerSystemPicker\(eyedropper.type.rawValue.capitalized)")))
             { _ in
-                eyedropper.picker()
+                let panel = NSColorPanel.shared
+                if panel.isVisible, panel.title == "\(eyedropper.type.rawValue.capitalized)" {
+                    panel.close()
+                } else {
+                    eyedropper.picker()
+                }
             }
             .onReceive(NotificationCenter.default.publisher(
                 for: Notification.Name("triggerFormatHex")))

diff --git a/Pika/Views/PreferencesView.swift b/Pika/Views/PreferencesView.swift
@@ -213,24 +213,26 @@ struct PreferencesView: View {
                                 Text(PikaText.textFormatDescription).font(.system(size: 13, weight: .medium))
                             ) {
                                 Picker(PikaText.textSpaceTitle, selection:
-                                    $colorSpace.onChange(perform: { Defaults[.colorSpace] = $0 }))
-                                {
-                                    ForEach(primarySpaces, id: \.self) { value in
-                                        if value == systemDefaultSpace {
-                                            Text("\(PikaText.textSystemDefault) (\(value.localizedName!))")
-                                                .tag(value)
-                                        } else {
+                                    $colorSpace.onChange(perform: {
+                                        NSColorPanel.shared.close()
+                                        Defaults[.colorSpace] = $0
+                                    })) {
+                                        ForEach(primarySpaces, id: \.self) { value in
+                                            if value == systemDefaultSpace {
+                                                Text("\(PikaText.textSystemDefault) (\(value.localizedName!))")
+                                                    .tag(value)
+                                            } else {
+                                                Text(value.localizedName!)
+                                                    .tag(value)
+                                            }
+                                        }
+                                        Divider()
+                                        ForEach(availableSpaces, id: \.self) { value in
                                             Text(value.localizedName!)
                                                 .tag(value)
                                         }
                                     }
-                                    Divider()
-                                    ForEach(availableSpaces, id: \.self) { value in
-                                        Text(value.localizedName!)
-                                            .tag(value)
-                                    }
-                                }
-                                .labelsHidden()
+                                    .labelsHidden()
                             }
                         }
                     }