Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-08-02 14:57:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

macos: stylistic changes

Browse Source
This commit is contained in:
Mitchell Hashimoto
2023-09-28 08:34:27 -07:00
parent 137d24db9c
commit 0e4b91de88
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
macos/Sources/Features/Primary Window/PrimaryWindowManager.swift
View File

@ -189,7 +189,7 @@ class PrimaryWindowManager {
for (index, window) in windows.enumerated().prefix(9) {
let action = "goto_tab:\(index + 1)"
let trigger = ghostty_config_trigger(cfg, action, UInt(action.count))
guard let equiv = Ghostty.keyEquivalent(key: trigger.key, mods: trigger.mods) else {
guard let equiv = Ghostty.keyEquivalentLabel(key: trigger.key, mods: trigger.mods) else {
continue
}

23
macos/Sources/Ghostty/Ghostty.Input.swift
View File

@ -7,24 +7,17 @@ extension Ghostty {
return Self.keyToEquivalent[key]
}
static func keyEquivalent(key: ghostty_input_key_e, mods: ghostty_input_mods_e) -> String? {
/// Returns the keyEquivalent label that includes the mods.
static func keyEquivalentLabel(key: ghostty_input_key_e, mods: ghostty_input_mods_e) -> String? {
guard var key = Self.keyEquivalent(key: key) else { return nil }
let flags = Self.eventModifierFlags(mods: mods)
if flags.contains(.command) {
key = "⌘\(key)"
}
if flags.contains(.shift) {
key = "⇧\(key)"
}
if flags.contains(.option) {
key = "⌥\(key)"
}
if flags.contains(.control) {
key = "⌃\(key)"
}
// Note: the order below matters; it matches the ordering modifiers show for
// macOS menu shortcut labels.
if flags.contains(.command) { key = "⌘\(key)" }
if flags.contains(.shift) { key = "⇧\(key)" }
if flags.contains(.option) { key = "⌥\(key)" }
if flags.contains(.control) { key = "⌃\(key)" }
return key
}