5 Commits
Author SHA1 Message Date
acheronfail fae18352f5 version: 1.6.0 2021-03-10 03:37:52 +11:00
acheronfail fae16445c4 fix: remove check for NSCarbonMenuWindow
Seems that it still works without it (at least on macOS 11.2.1)
2021-03-10 03:35:10 +11:00
acheronfail fae13868f1 feat: allow changing magnification with keyboard 2021-03-10 02:52:45 +11:00
acheronfail 711ebbef25 Merge pull request #35 from kawarimidoll/patch-1
docs: Fix installation instructions in README.md
2021-02-21 00:51:45 +00:00
カワリミ人形 10af3f23a2 docs: fix brew command
Calling brew cask install is disabled
2021-01-08 11:21:41 +09:00
6 changed files with 31 additions and 15 deletions
+4 -4
View File
@@ -565,7 +565,7 @@
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 19;
CURRENT_PROJECT_VERSION = 20;
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@@ -575,7 +575,7 @@
INFOPLIST_FILE = "Pixel Picker/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.12;
MARKETING_VERSION = 1.5.0;
MARKETING_VERSION = 1.6.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.acheronfail.pixel-picker";
PRODUCT_MODULE_NAME = PixelPicker;
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -593,7 +593,7 @@
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 19;
CURRENT_PROJECT_VERSION = 20;
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@@ -603,7 +603,7 @@
INFOPLIST_FILE = "Pixel Picker/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.12;
MARKETING_VERSION = 1.5.0;
MARKETING_VERSION = 1.6.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.acheronfail.pixel-picker";
PRODUCT_MODULE_NAME = PixelPicker;
PRODUCT_NAME = "$(TARGET_NAME)";
+4 -1
View File
@@ -168,11 +168,14 @@ extension AppDelegate: NSMenuDelegate {
@objc private func setColorSpace(_ sender: NSMenuItem) {
PPState.shared.colorSpace = sender.representedObject as? String
}
static let MIN_MAGNIFICATION = 4
static let MAX_MAGNIFICATION = 24
// A menu which allows the magnification level of the picker to be adjusted.
private func buildMagnificationMenu() {
let submenu = NSMenu()
for i in stride(from: 4, through: 24, by: 2) {
for i in stride(from: AppDelegate.MIN_MAGNIFICATION, through: AppDelegate.MAX_MAGNIFICATION, by: 2) {
let item = submenu.addItem(withTitle: "\(i)x", action: #selector(selectMagnification(_:)), keyEquivalent: "")
item.representedObject = i
item.state = PPState.shared.magnificationLevel == i ? .on : .off
@@ -114,22 +114,33 @@ class PPOverlayController: NSWindowController {
case kVK_RightArrow:
PPState.shared.chosenFormat = PPState.shared.chosenFormat.next()
updateInfoPanel(lastHighlightedColor, lastHighlightedColor.bestContrastingColor())
// Move up
case kVK_ANSI_K:
moveByPixel(dx: 0.0, dy: 1.0)
// Move up
break
// Move down
case kVK_ANSI_J:
moveByPixel(dx: 0.0, dy: -1.0)
// Move down
break
// Move left
case kVK_ANSI_H:
moveByPixel(dx: -1.0, dy: 0.0)
// Move left
break
// Move right
case kVK_ANSI_L:
moveByPixel(dx: 1.0, dy: 0.0)
// Move right
break
// Adjust magnification with `+` or `-` and `[` or `]`
case kVK_ANSI_Minus:
fallthrough
case kVK_ANSI_LeftBracket:
PPState.shared.changeMagnification(-2)
moveByPixel(dx: 0, dy: 0)
case kVK_ANSI_Equal:
fallthrough
case kVK_ANSI_RightBracket:
PPState.shared.changeMagnification(2)
moveByPixel(dx: 0, dy: 0)
default:
break
}
-5
View File
@@ -75,11 +75,6 @@ CGFloat cancelBoundary = 15;
NSWindow *carbonWindow = [self window];
if (carbonWindow != nil) {
if (![carbonWindow.className isEqualToString:@"NSCarbonMenuWindow"]) {
NSLog(@"PPMenuShortcutView is designed to work with NSCarbonMenuWindow.");
return;
}
EventTargetRef target = GetApplicationEventTarget();
if (!target) {
NSLog(@"GetEventDispatcherTarget() failed.");
+7
View File
@@ -79,6 +79,13 @@ import CocoaLumberjackSwift
return setupMenuBarIcon(NSImage(named: NSImage.Name(stringLiteral: "icon-default")))
}
func changeMagnification(_ n: Int) {
let level = magnificationLevel + n
if AppDelegate.MIN_MAGNIFICATION <= level && level <= AppDelegate.MAX_MAGNIFICATION {
magnificationLevel = level
}
}
/**
* Below are methods related to saving/loading state from disk.
+1 -1
View File
@@ -21,7 +21,7 @@ Pixel Picker is like Digital Color Meter, but lives in your menu bar and lets yo
#### Via Homebrew:
```bash
brew cask install pixel-picker
brew install --cask pixel-picker
```
#### Via GitHub Releases