Skip to content

fix bonesplit to show custom modifier keys #32

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
gmmeyer wants to merge 1 commit into
base: main
Choose a base branch
from
+51 −13
Open

fix bonesplit to show custom modifier keys #32

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
64 changes: 51 additions & 13 deletions Sources/Bonsplit/Internal/Views/TabBarView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,16 +636,16 @@ private struct EmptyTabBarDoubleClickMonitorView: NSViewRepresentable {
}

enum TabControlShortcutModifier: Equatable {
case control
case command
/// The modifier flags the user is holding.
case flags(NSEvent.ModifierFlags)

var symbol: String {
TabControlShortcutHintPolicy.symbolString(for: resolvedFlags)
}

private var resolvedFlags: NSEvent.ModifierFlags {
switch self {
case .control:
return "⌃"
case .command:
// Command-hold can reveal pane hints, but pane navigation itself is control-based.
return "⌃"
case .flags(let f): return f
}
}
}
Expand All @@ -655,6 +655,12 @@ enum TabControlShortcutHintPolicy {
static let showHintsOnCommandHoldKey = "shortcutHintShowOnCommandHold"
static let defaultShowHintsOnCommandHold = true

// Keys shared with the host app's DigitShortcutModifierSettings.
private static let workspaceModifierKey = "digitShortcutWorkspaceModifierFlags"
private static let surfaceModifierKey = "digitShortcutSurfaceModifierFlags"
private static let defaultSurfaceFlags: NSEvent.ModifierFlags = [.control]
private static let defaultWorkspaceFlags: NSEvent.ModifierFlags = [.command]

static func showHintsOnCommandHoldEnabled(defaults: UserDefaults = .standard) -> Bool {
guard defaults.object(forKey: showHintsOnCommandHoldKey) != nil else {
return defaultShowHintsOnCommandHold
Expand All @@ -668,8 +674,12 @@ enum TabControlShortcutHintPolicy {
) -> TabControlShortcutModifier? {
guard showHintsOnCommandHoldEnabled(defaults: defaults) else { return nil }
let flags = modifierFlags.intersection(.deviceIndependentFlagsMask)
if flags == [.control] { return .control }
if flags == [.command] { return .command }
let surfaceFlags = resolvedSurfaceFlags(defaults: defaults)
let workspaceFlags = resolvedWorkspaceFlags(defaults: defaults)
// Surface modifier triggers pane-tab hints; workspace modifier also
// triggers them so the user sees all digit hints at once.
if flags == surfaceFlags { return .flags(surfaceFlags) }
if flags == workspaceFlags { return .flags(workspaceFlags) }
return nil
}

Expand Down Expand Up @@ -702,6 +712,34 @@ enum TabControlShortcutHintPolicy {
keyWindowNumber: keyWindowNumber
)
}

// MARK: - Helpers

/// The symbol for the configured surface modifier (shown on pane-tab hint pills).
static func surfaceModifierSymbol(defaults: UserDefaults = .standard) -> String {
symbolString(for: resolvedSurfaceFlags(defaults: defaults))
}

static func symbolString(for flags: NSEvent.ModifierFlags) -> String {
var parts: [String] = []
if flags.contains(.control) { parts.append("⌃") }
if flags.contains(.option) { parts.append("⌥") }
if flags.contains(.shift) { parts.append("⇧") }
if flags.contains(.command) { parts.append("⌘") }
return parts.joined()
}

private static func resolvedSurfaceFlags(defaults: UserDefaults) -> NSEvent.ModifierFlags {
let raw = defaults.integer(forKey: surfaceModifierKey)
guard raw != 0 else { return defaultSurfaceFlags }
return NSEvent.ModifierFlags(rawValue: UInt(raw)).intersection(.deviceIndependentFlagsMask)
Copy link
Copy Markdown

@cubic-dev-ai cubic-dev-ai Bot Mar 19, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2: Resolved modifier flags are not validated after masking; invalid nonzero stored values can become empty flags and incorrectly trigger hint mode with no modifier pressed.

Prompt for AI agents 
Check if this issue is valid — if so, understand the root cause and fix it. At Sources/Bonsplit/Internal/Views/TabBarView.swift, line 735:

<comment>Resolved modifier flags are not validated after masking; invalid nonzero stored values can become empty flags and incorrectly trigger hint mode with no modifier pressed.</comment>

<file context>
@@ -702,6 +712,34 @@ enum TabControlShortcutHintPolicy {
+    private static func resolvedSurfaceFlags(defaults: UserDefaults) -> NSEvent.ModifierFlags {
+        let raw = defaults.integer(forKey: surfaceModifierKey)
+        guard raw != 0 else { return defaultSurfaceFlags }
+        return NSEvent.ModifierFlags(rawValue: UInt(raw)).intersection(.deviceIndependentFlagsMask)
+    }
+
</file context>
Fix with Cubic

}

private static func resolvedWorkspaceFlags(defaults: UserDefaults) -> NSEvent.ModifierFlags {
let raw = defaults.integer(forKey: workspaceModifierKey)
guard raw != 0 else { return defaultWorkspaceFlags }
return NSEvent.ModifierFlags(rawValue: UInt(raw)).intersection(.deviceIndependentFlagsMask)
}
}

private struct TabBarHostWindowReader: NSViewRepresentable {
Expand All @@ -725,7 +763,7 @@ private struct TabBarHostWindowReader: NSViewRepresentable {
@MainActor
private final class TabControlShortcutKeyMonitor: ObservableObject {
@Published private(set) var isShortcutHintVisible = false
@Published private(set) var shortcutModifierSymbol = "⌃"
@Published private(set) var shortcutModifierSymbol = TabControlShortcutHintPolicy.surfaceModifierSymbol()

private weak var hostWindow: NSWindow?
private var hostWindowDidBecomeKeyObserver: NSObjectProtocol?
Expand Down Expand Up @@ -842,7 +880,7 @@ private final class TabControlShortcutKeyMonitor: ObservableObject {
}

if isShortcutHintVisible {
shortcutModifierSymbol = modifier.symbol
shortcutModifierSymbol = TabControlShortcutHintPolicy.surfaceModifierSymbol()
return
}

Expand All @@ -867,8 +905,8 @@ private final class TabControlShortcutKeyMonitor: ObservableObject {
eventWindowNumber: nil,
keyWindowNumber: NSApp.keyWindow?.windowNumber
) else { return }
guard let currentModifier = TabControlShortcutHintPolicy.hintModifier(for: NSEvent.modifierFlags) else { return }
self.shortcutModifierSymbol = currentModifier.symbol
guard TabControlShortcutHintPolicy.hintModifier(for: NSEvent.modifierFlags) != nil else { return }
self.shortcutModifierSymbol = TabControlShortcutHintPolicy.surfaceModifierSymbol()
withAnimation(.easeInOut(duration: 0.14)) {
self.isShortcutHintVisible = true
}
Expand Down