From bc1118df1adf3a6013a341a2172516b36798866d Mon Sep 17 00:00:00 2001 From: Charlie Gleason Date: Fri, 5 Mar 2021 18:44:22 +0000 Subject: [PATCH] Small fix for behaviour when Pika is hidden --- Pika/Utilities/Eyedroppers.swift | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Pika/Utilities/Eyedroppers.swift b/Pika/Utilities/Eyedroppers.swift index b1dd5dd..a6b2be2 100644 --- a/Pika/Utilities/Eyedroppers.swift +++ b/Pika/Utilities/Eyedroppers.swift @@ -15,6 +15,7 @@ class Eyedropper: ObservableObject { } let type: Types + var forceShow = false @objc @Published public var color: NSColor @@ -29,6 +30,9 @@ class Eyedropper: ObservableObject { func start() { if Defaults[.hidePikaWhilePicking] { + if NSApp.mainWindow?.isVisible == true { + forceShow = true + } NSApp.sendAction(#selector(AppDelegate.hidePika), to: nil, from: nil) } @@ -37,8 +41,11 @@ class Eyedropper: ObservableObject { sampler.show { selectedColor in if let selectedColor = selectedColor { - NSApp.sendAction(#selector(AppDelegate.showPika), to: nil, from: nil) self.color = selectedColor.usingColorSpace(Defaults[.colorSpace])! + NSApp.sendAction(#selector(AppDelegate.showPika), to: nil, from: nil) + } else if self.forceShow { + self.forceShow = false + NSApp.sendAction(#selector(AppDelegate.showPika), to: nil, from: nil) } } }