KofTwentyTwo/CommandTabFree
2
0 Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 4 Wiki Activity

feat: allow shortcuts to be modifiers-only (closes #243)

Browse Source
This commit is contained in:
Louis Pontoise authored and lwouis committed 2020-04-19 01:29:54 +09:00
1 parent 2e0c096612
commit d4be0954d7
5 files changed
+17 -16
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

alt-tab-macos.xcodeproj/project.pbxproj
+4 -4
View File
@@ -17,7 +17,7 @@
D04BA11E56383D082D7BE5A5 /* ThumbnailsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D04BAA998119CAA8B70A2B67 /* ThumbnailsView.swift */; };
D04BA14D93726795A6937832 /* LabelAndControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = D04BA2526DC6726E0F7ACF7C /* LabelAndControl.swift */; };
D04BA15A1B0C4871EA7CB899 /* GeneralTab.swift in Sources */ = {isa = PBXBuildFile; fileRef = D04BACE22DC907F03D193075 /* GeneralTab.swift */; };
D04BA1621718FF26F8D5E75D /* UnclearableRecorderControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = D04BAE333F7170E87C5AC0EF /* UnclearableRecorderControl.swift */; };
D04BA1621718FF26F8D5E75D /* CustomRecorderControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = D04BAE333F7170E87C5AC0EF /* CustomRecorderControl.swift */; };
D04BA1637E125D38546C26E2 /* StackView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D04BA8AC77465E1B2BC947CF /* StackView.swift */; };
D04BA1B133D53572D7B312C2 /* ThumbnailFontIconView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D04BA1DF8CAB2FAB7FE9244B /* ThumbnailFontIconView.swift */; };
D04BA1C85041FB043FD43E65 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = D04BA05006D56C7AA011C0CE /* Localizable.strings */; };
@@ -201,7 +201,7 @@
D04BADFEF9A8189ABC8BF5EE /* Localizable.strings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; path = Localizable.strings; sourceTree = "<group>"; };
D04BAE1243C9B4BE3ED1B524 /* 7 windows - 2 lines - extra wide window.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "7 windows - 2 lines - extra wide window.jpg"; sourceTree = "<group>"; };
D04BAE2DC036FD84446E1AE6 /* menubar-icon.svg */ = {isa = PBXFileReference; lastKnownFileType = file.svg; path = "menubar-icon.svg"; sourceTree = "<group>"; };
D04BAE333F7170E87C5AC0EF /* UnclearableRecorderControl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UnclearableRecorderControl.swift; sourceTree = "<group>"; };
D04BAE333F7170E87C5AC0EF /* CustomRecorderControl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomRecorderControl.swift; sourceTree = "<group>"; };
D04BAE5D665680CB4B13CA26 /* app-icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = "app-icon.icns"; sourceTree = "<group>"; };
D04BAE757BB2B605234FBF58 /* TabViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TabViewController.swift; sourceTree = "<group>"; };
D04BAE93A5854C501639C640 /* update_homebrew_cask.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = update_homebrew_cask.sh; sourceTree = "<group>"; };
@@ -353,7 +353,7 @@
children = (
D04BA6D57A1456C07318B8EA /* GridView.swift */,
D04BAA41B9A74189B065D856 /* text */,
D04BAE333F7170E87C5AC0EF /* UnclearableRecorderControl.swift */,
D04BAE333F7170E87C5AC0EF /* CustomRecorderControl.swift */,
D04BA8AC77465E1B2BC947CF /* StackView.swift */,
);
path = "generic-components";
@@ -851,7 +851,7 @@
D04BAD2A7F2E8BF64EE982E9 /* TextArea.swift in Sources */,
D04BA7F86F1926FBE31F44BF /* BaseLabel.swift in Sources */,
D04BA11E56383D082D7BE5A5 /* ThumbnailsView.swift in Sources */,
D04BA1621718FF26F8D5E75D /* UnclearableRecorderControl.swift in Sources */,
D04BA1621718FF26F8D5E75D /* CustomRecorderControl.swift in Sources */,
D04BA78B5D288BF072050C43 /* Keyboard.swift in Sources */,
D04BA1637E125D38546C26E2 /* StackView.swift in Sources */,
D04BA7B8D599E1A7A27FF5AE /* AcknowledgmentsTab.swift in Sources */,
src/ui/generic-components/UnclearableRecorderControl.swift → src/ui/generic-components/CustomRecorderControl.swift
+9 -8
View File
@@ -1,29 +1,30 @@
import Cocoa
import ShortcutRecorder
class UnclearableRecorderControl: RecorderControl, RecorderControlDelegate {
convenience init(_ shortcutString: String, _ modifierFlagsOnly: Bool) {
class CustomRecorderControl: RecorderControl, RecorderControlDelegate {
var clearable: Bool!
convenience init(_ shortcutString: String, _ clearable: Bool) {
self.init(frame: .zero)
self.clearable = clearable
delegate = self
allowsEscapeToCancelRecording = false
allowsDeleteToClearShortcutAndEndRecording = false
allowsModifierFlagsOnlyShortcut = true
set(allowedModifierFlags: CocoaModifierFlagsMask, requiredModifierFlags: [], allowsEmptyModifierFlags: true)
if modifierFlagsOnly {
allowsModifierFlagsOnlyShortcut = true
}
objectValue = Shortcut(keyEquivalent: shortcutString)
widthAnchor.constraint(equalToConstant: 100).isActive = true
}
override func drawClearButton(_ aDirtyRect: NSRect) {
if !allowsModifierFlagsOnlyShortcut {
if clearable {
super.drawClearButton(aDirtyRect)
}
}
// only allow modifiers: ⌥ -> valid, e -> invalid, ⌥e -> invalid
func recorderControl(_ aControl: RecorderControl, canRecord aShortcut: Shortcut) -> Bool {
// only allow modifiers: ⌥ -> valid, e -> invalid, ⌥e -> invalid
if allowsModifierFlagsOnlyShortcut && aShortcut.keyCode != .none {
if !clearable && aShortcut.keyCode != .none {
return false
}
return true
src/ui/generic-components/StackView.swift
+1 -1
View File
@@ -8,7 +8,7 @@ class StackView: NSStackView {
alignmentRectInsets_ = NSEdgeInsets(top: top, left: left, bottom: bottom, right: right)
alignment = orientation == .horizontal ? .firstBaseline : .left
// workaround: for some reason, horizontal stackviews with a RecorderControl have extra fittingSize.height
if orientation == .horizontal && views.first(where: { $0 is UnclearableRecorderControl }) != nil {
if orientation == .horizontal && views.first(where: { $0 is CustomRecorderControl }) != nil {
fit(fittingSize.width, fittingSize.height - 7)
} else {
fit()
src/ui/preferences-window/LabelAndControl.swift
+2 -2
View File
@@ -8,8 +8,8 @@ enum LabelPosition {
}
class LabelAndControl: NSObject {
static func makeLabelWithRecorder(_ labelText: String, _ rawName: String, _ shortcutString: String, _ modifierFlagsOnly: Bool = false, labelPosition: LabelPosition = .leftWithSeparator) -> [NSView] {
let input = UnclearableRecorderControl(shortcutString, modifierFlagsOnly)
static func makeLabelWithRecorder(_ labelText: String, _ rawName: String, _ shortcutString: String, _ clearable: Bool = true, labelPosition: LabelPosition = .leftWithSeparator) -> [NSView] {
let input = CustomRecorderControl(shortcutString, clearable)
let views = makeLabelWithProvidedControl(labelText, rawName, input, labelPosition: labelPosition, extraAction: GeneralTab.shortcutChangedCallback)
input.sendAction(input.action, to: input.target)
return views
src/ui/preferences-window/tabs/GeneralTab.swift
+1 -1
View File
@@ -8,7 +8,7 @@ class GeneralTab {
static func makeView() -> NSView {
let startAtLogin = LabelAndControl.makeLabelWithCheckbox(NSLocalizedString("Start at login", comment: ""), "startAtLogin", extraAction: startAtLoginCallback)
var holdShortcut = LabelAndControl.makeLabelWithRecorder(NSLocalizedString("Hold", comment: ""), "holdShortcut", Preferences.holdShortcut, true, labelPosition: .leftWithoutSeparator)
var holdShortcut = LabelAndControl.makeLabelWithRecorder(NSLocalizedString("Hold", comment: ""), "holdShortcut", Preferences.holdShortcut, false, labelPosition: .leftWithoutSeparator)
holdShortcut.append(LabelAndControl.makeLabel(NSLocalizedString("then press:", comment: "")))
let nextWindowShortcut = LabelAndControl.makeLabelWithRecorder(NSLocalizedString("Select next window", comment: ""), "nextWindowShortcut", Preferences.nextWindowShortcut, labelPosition: .right)
let previousWindowShortcut = LabelAndControl.makeLabelWithRecorder(NSLocalizedString("Select previous window", comment: ""), "previousWindowShortcut", Preferences.previousWindowShortcut, labelPosition: .right)