-
-
Notifications
You must be signed in to change notification settings - Fork 2
Add global hotkeys for toggling MiddleDrag and menu bar visibility #121
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
a0618aa
Add global hotkeys for toggling MiddleDrag and menu bar visibility
NullPointerDepressiveDisorder e211237
Implement hotkey customization and recording functionality
NullPointerDepressiveDisorder 5c6fb73
Add applicationShouldHandleReopen method and update menu item text
NullPointerDepressiveDisorder d0b2b66
Implement cleanup for hotkey recording and improve alert handling
NullPointerDepressiveDisorder faaefbc
Refactor multitouch and hotkey handling for improved safety and funct…
NullPointerDepressiveDisorder 263a4d2
Refactor menu bar visibility handling and enhance hotkey tests
NullPointerDepressiveDisorder e2ef448
Enhance MenuBarController to skip button click during tests
NullPointerDepressiveDisorder d3f3865
Refactor MenuBarController hotkey handling for improved safety
NullPointerDepressiveDisorder File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| // | ||
| // HotKeyRecorderView.swift | ||
| // MiddleDrag | ||
| // | ||
|
|
||
| import Cocoa | ||
| import Carbon.HIToolbox | ||
|
|
||
| /// A button that captures the next key + modifier combo when clicked. | ||
| /// Displays the current binding as a human-readable string (e.g. "⌘⇧E"). | ||
| @MainActor | ||
| final class HotKeyRecorderView: NSButton { | ||
|
|
||
| var binding: HotKeyBinding { | ||
| didSet { updateLabel() } | ||
| } | ||
|
|
||
| var onBindingChanged: ((HotKeyBinding) -> Void)? | ||
|
|
||
| private var isRecording = false | ||
| private var localMonitor: Any? | ||
|
|
||
| init(binding: HotKeyBinding) { | ||
| self.binding = binding | ||
| super.init(frame: .zero) | ||
| bezelStyle = .recessed | ||
| setButtonType(.momentaryPushIn) | ||
| isBordered = true | ||
| font = .monospacedSystemFont(ofSize: 12, weight: .medium) | ||
| updateLabel() | ||
| target = self | ||
| action = #selector(startRecording) | ||
| } | ||
|
|
||
| @available(*, unavailable) | ||
| required init?(coder: NSCoder) { | ||
| fatalError("init(coder:) not implemented") | ||
| } | ||
|
|
||
| private func updateLabel() { | ||
| title = isRecording ? "Press a key…" : binding.displayString | ||
| } | ||
|
|
||
| @objc private func startRecording() { | ||
| guard !isRecording else { return } | ||
| isRecording = true | ||
| updateLabel() | ||
|
|
||
| localMonitor = NSEvent.addLocalMonitorForEvents(matching: .keyDown) { [weak self] event in | ||
| self?.handleKeyDown(event) | ||
| return nil // swallow the event | ||
| } | ||
| } | ||
|
|
||
| private func stopRecording() { | ||
| isRecording = false | ||
| if let monitor = localMonitor { | ||
| NSEvent.removeMonitor(monitor) | ||
| localMonitor = nil | ||
| } | ||
| updateLabel() | ||
| } | ||
|
|
||
| private func handleKeyDown(_ event: NSEvent) { | ||
| let modifiers = GlobalHotKeyManager.carbonModifiers(from: event.modifierFlags) | ||
|
|
||
| // Escape cancels without changing the binding | ||
| if event.keyCode == UInt16(kVK_Escape) { | ||
| stopRecording() | ||
| return | ||
| } | ||
|
|
||
| // Require at least one modifier (bare keys are too easy to trigger accidentally) | ||
| guard modifiers != 0 else { return } | ||
|
|
||
| let newBinding = HotKeyBinding( | ||
| keyCode: UInt32(event.keyCode), | ||
| carbonModifiers: modifiers | ||
| ) | ||
|
|
||
| binding = newBinding | ||
| stopRecording() | ||
| onBindingChanged?(newBinding) | ||
| } | ||
|
|
||
| // If the view loses focus while recording, cancel | ||
| override func resignFirstResponder() -> Bool { | ||
| if isRecording { stopRecording() } | ||
| return super.resignFirstResponder() | ||
| } | ||
| } | ||
|
|
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.