Small fix for behaviour when Pika is hidden

superhighfives · Mar 5, 2021 · bc1118d · bc1118d
1 parent dc89795
commit bc1118d
Showing 1 changed file with 8 additions and 1 deletion.
diff --git 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)
  }
  }
  }