Skip to content

Switch bar sections with Command-Left and Command-Right #83

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.

Sign up for GitHub

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

Open
alvst wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Switch bar sections with Command-Left and Command-Right #83

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions Sources/Pesty/AppController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,9 +524,15 @@ final class AppController: NSObject, NSApplicationDelegate, NSWindowDelegate {
return nil
case kVK_Return, kVK_ANSI_KeypadEnter:
pasteSelected(); return nil
case kVK_LeftArrow, kVK_UpArrow:
case kVK_LeftArrow:
if cmd { moveBarSection(by: -1) } else { store.moveSelection(by: -1) }
return nil
case kVK_RightArrow:
if cmd { moveBarSection(by: 1) } else { store.moveSelection(by: 1) }
return nil
case kVK_UpArrow:
store.moveSelection(by: -1); return nil
case kVK_RightArrow, kVK_DownArrow:
case kVK_DownArrow:
store.moveSelection(by: 1); return nil
case kVK_Delete:
if cmd { deleteEffectiveSelection(); return nil }
Expand Down Expand Up @@ -565,6 +571,19 @@ final class AppController: NSObject, NSApplicationDelegate, NSWindowDelegate {
return event
}

/// Cycles the same sources, in the same order, that the tab bar presents.
/// The plus button is intentionally excluded: it creates a new pinboard
/// rather than representing a navigable section.
private func moveBarSection(by delta: Int) {
let sources: [BarSource] = [.history] + store.pinboards.map { .pinboard($0.id) }
guard !sources.isEmpty else { return }

let currentIndex = sources.firstIndex(of: store.source) ?? 0
let nextIndex = (currentIndex + delta % sources.count + sources.count) % sources.count
store.source = sources[nextIndex]
store.selectFirst()
}

private static func quickPasteDigit(for keyCode: Int) -> Int? {
switch keyCode {
case kVK_ANSI_1, kVK_ANSI_Keypad1: return 1
Expand Down
Loading