mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2026-04-19 05:50:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

macOS: add NormalizedMenuShortcutKeyTests

Browse Source
This commit is contained in:
Lukas
2026-03-30 14:04:55 +02:00
parent 5c5f645b61
commit 65cd31dc79
2 changed files with 105 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
macos/Sources/App/macOS/AppDelegate.swift
View File

@@ -1288,18 +1288,25 @@ extension AppDelegate {
}
/// Hashable key for a menu shortcut match, normalized for quick lookup.
private struct MenuShortcutKey: Hashable {
struct MenuShortcutKey: Hashable {
private static let shortcutModifiers: NSEvent.ModifierFlags = [.shift, .control, .option, .command]
private let keyEquivalent: String
private let modifiersRawValue: UInt
let keyEquivalent: String
let modifiersRawValue: UInt
init?(keyEquivalent: String, modifiers: NSEvent.ModifierFlags) {
let normalized = keyEquivalent.lowercased()
guard !normalized.isEmpty else { return nil }
var mods = modifiers.intersection(Self.shortcutModifiers)
if
keyEquivalent.lowercased() != keyEquivalent.uppercased(),
normalized.uppercased() == keyEquivalent {
// If key equivalent is case sensitive and
// it's originally uppercased, then we need to add `shift` to the modifiers
mods.insert(.shift)
}
self.keyEquivalent = normalized
self.modifiersRawValue = modifiers.intersection(Self.shortcutModifiers).rawValue
self.modifiersRawValue = mods.rawValue
}
init?(event: NSEvent) {