File tree Expand file tree Collapse file tree 2 files changed +7
-5
lines changed
Sources/KeyboardShortcuts Expand file tree Collapse file tree 2 files changed +7
-5
lines changed Original file line number Diff line number Diff line change @@ -96,7 +96,7 @@ extension NSMenuItem {
96
96
return
97
97
}
98
98
99
- keyEquivalent = shortcut. keyEquivalent ?? " "
99
+ keyEquivalent = shortcut. nsMenuItemKeyEquivalent ?? " "
100
100
keyEquivalentModifierMask = shortcut. modifiers
101
101
102
102
if #available( macOS 12 , * ) {
Original file line number Diff line number Diff line change @@ -152,7 +152,7 @@ extension KeyboardShortcuts.Shortcut {
152
152
}
153
153
154
154
if
155
- self . keyEquivalent == keyEquivalent, // Note `nil != ""`
155
+ self . nsMenuItemKeyEquivalent == keyEquivalent, // Note `nil != ""`
156
156
self . modifiers == keyEquivalentModifierMask
157
157
{
158
158
return item
@@ -691,17 +691,19 @@ extension KeyboardShortcuts.Shortcut {
691
691
if string. count == 1 {
692
692
return string. first
693
693
}
694
+
694
695
return nil
695
696
}
696
697
697
- // This can be exposed if anyone needs it, but I prefer to keep the API surface small for now.
698
698
/**
699
+ Key equivalent string in `NSMenuItem` format.
700
+
699
701
This can be used to show the keyboard shortcut in a `NSMenuItem` by assigning it to `NSMenuItem#keyEquivalent`.
700
702
701
- - Note: Don't forget to also pass `. modifiers` to `NSMenuItem#keyEquivalentModifierMask`.
703
+ - Note: Don't forget to also pass ``Shortcut/ modifiers` ` to `NSMenuItem#keyEquivalentModifierMask`.
702
704
*/
703
705
@MainActor
704
- var keyEquivalent : String ? {
706
+ public var nsMenuItemKeyEquivalent : String ? {
705
707
if
706
708
let key,
707
709
let specialKey = keyToSpecialKeyMapping [ key]
You can’t perform that action at this time.
0 commit comments