Merge pull request #70 from superhighfives/copy-on-pick

Adds option to automatically copy the picked colour
superhighfives · Nov 22, 2021 · 4bb13c6 · 4bb13c6
2 parents ca89266 + d7076c5
commit 4bb13c6
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 8 deletions.
diff --git a/Pika.xcodeproj/project.pbxproj b/Pika.xcodeproj/project.pbxproj
@@ -596,7 +596,7 @@
  CODE_SIGN_IDENTITY = "Apple Development";
  CODE_SIGN_STYLE = Automatic;
  COMBINE_HIDPI_IMAGES = YES;
- CURRENT_PROJECT_VERSION = 21;
+ CURRENT_PROJECT_VERSION = 23;
  DEVELOPMENT_ASSET_PATHS = "\"Pika/Preview Content\"";
  DEVELOPMENT_TEAM = TGHU37N6EX;
  ENABLE_HARDENED_RUNTIME = YES;
@@ -607,7 +607,7 @@
  "@executable_path/../Frameworks",
  );
  MACOSX_DEPLOYMENT_TARGET = 10.15;
- MARKETING_VERSION = 0.0.11;
+ MARKETING_VERSION = 0.0.12;
  PRODUCT_BUNDLE_IDENTIFIER = com.superhighfives.Pika;
  PRODUCT_NAME = "$(TARGET_NAME)";
  SWIFT_VERSION = 5.0;
@@ -623,7 +623,7 @@
  CODE_SIGN_IDENTITY = "Apple Development";
  CODE_SIGN_STYLE = Automatic;
  COMBINE_HIDPI_IMAGES = YES;
- CURRENT_PROJECT_VERSION = 21;
+ CURRENT_PROJECT_VERSION = 23;
  DEVELOPMENT_ASSET_PATHS = "\"Pika/Preview Content\"";
  DEVELOPMENT_TEAM = TGHU37N6EX;
  ENABLE_HARDENED_RUNTIME = YES;
@@ -634,7 +634,7 @@
  "@executable_path/../Frameworks",
  );
  MACOSX_DEPLOYMENT_TARGET = 10.15;
- MARKETING_VERSION = 0.0.11;
+ MARKETING_VERSION = 0.0.12;
  PRODUCT_BUNDLE_IDENTIFIER = com.superhighfives.Pika;
  PRODUCT_NAME = "$(TARGET_NAME)";
  SWIFT_VERSION = 5.0;

diff --git a/Pika/AppDelegate.swift b/Pika/AppDelegate.swift
@@ -173,7 +173,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
  if preferencesWindow == nil {
  preferencesWindow = PikaWindow.createSecondaryWindow(
  title: "Preferences",
- size: NSRect(x: 0, y: 0, width: 550, height: 420),
+ size: NSRect(x: 0, y: 0, width: 550, height: 450),
  styleMask: [.titled, .closable, .miniaturizable, .fullSizeContentView]
  )
  preferencesWindow.contentView = NSHostingView(rootView: PreferencesView())

diff --git a/Pika/Assets/en.lproj/Localizable.strings b/Pika/Assets/en.lproj/Localizable.strings
diff --git a/Pika/Assets/fr.lproj/Localizable.strings b/Pika/Assets/fr.lproj/Localizable.strings
diff --git a/Pika/Constants/Defaults.swift b/Pika/Constants/Defaults.swift
@@ -12,6 +12,7 @@ extension Defaults.Keys {
  static let colorFormat = Key<ColorFormat>("colorFormat", default: .hex)
  static let viewedSplash = Key<Bool>("viewedSplash", default: false)
  static let hidePikaWhilePicking = Key<Bool>("hidePikaWhilePicking", default: false)
+ static let copyColorOnPick = Key<Bool>("copyColorOnPick", default: false)
  static let hideMenuBarIcon = Key<Bool>("hideMenuBarIcon", default: false)
  static let betaUpdates = Key<Bool>("betaUpdates", default: false)
  static let colorSpace = NSSecureCodingKey<NSColorSpace>(

diff --git a/Pika/Utilities/Eyedroppers.swift b/Pika/Utilities/Eyedroppers.swift
@@ -75,8 +75,15 @@ class Eyedropper: ObservableObject {
 
  if let selectedColor = selectedColor {
  self.color = selectedColor.usingColorSpace(Defaults[.colorSpace])!
- NSApp.sendAction(#selector(AppDelegate.showPika), to: nil, from: nil)
- } else if self.forceShow {
+
+ if Defaults[.copyColorOnPick] {
+ NSApp.sendAction(self.type.copySelector, to: nil, from: nil)
+ } else {
+ NSApp.sendAction(#selector(AppDelegate.showPika), to: nil, from: nil)
+ }
+ }
+
+ if self.forceShow {
  self.forceShow = false
  NSApp.sendAction(#selector(AppDelegate.showPika), to: nil, from: nil)
  }

diff --git a/Pika/Views/EyedropperButton.swift b/Pika/Views/EyedropperButton.swift
@@ -6,7 +6,6 @@ struct EyedropperButton: View {
  @ObservedObject var eyedropper: Eyedropper
  @Default(.colorFormat) var colorFormat
  @Default(.hideColorNames) var hideColorNames
- let pasteboard = NSPasteboard.general
 
  @State var copyVisible: Bool = false
  @State private var timerSubscription: Cancellable?

diff --git a/Pika/Views/NavigationMenuItems.swift b/Pika/Views/NavigationMenuItems.swift
@@ -23,13 +23,17 @@ struct MenuGroup<Content>: View where Content: View {
 
 struct NavigationMenuItems: View {
  @Default(.hidePikaWhilePicking) var hidePikaWhilePicking
+ @Default(.copyColorOnPick) var copyColorOnPick
  @Default(.hideFormatOnCopy) var hideFormatOnCopy
 
  var body: some View {
  Group {
  Toggle(isOn: $hidePikaWhilePicking) {
  Text(NSLocalizedString("color.pick.hide", comment: "Hide Pika while picking"))
  }
+ Toggle(isOn: $copyColorOnPick) {
+ Text(NSLocalizedString("color.pick.copy", comment: "Copy color when picking"))
+ }
  }
  VStack {
  Divider()