From 72b1e5821876c1a528f880dd25784828c3c7bf23 Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Sun, 25 Jul 2021 20:19:08 +1000 Subject: [PATCH] [windows-x] Deprecate Super key for now --- v2/pkg/menu/keys/keys.go | 21 +++++++++++---------- v2/pkg/menu/keys/stringify.go | 6 +++--- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/v2/pkg/menu/keys/keys.go b/v2/pkg/menu/keys/keys.go index 91edb976..73bc9414 100644 --- a/v2/pkg/menu/keys/keys.go +++ b/v2/pkg/menu/keys/keys.go @@ -16,7 +16,7 @@ const ( // ShiftKey represents the shift key on all systems ShiftKey Modifier = "shift" // SuperKey represents Command on Mac and the Windows key on the other platforms - SuperKey Modifier = "super" + //SuperKey Modifier = "super" // ControlKey represents the control key on all systems ControlKey Modifier = "ctrl" ) @@ -25,8 +25,8 @@ var modifierMap = map[string]Modifier{ "cmdorctrl": CmdOrCtrlKey, "optionoralt": OptionOrAltKey, "shift": ShiftKey, - "super": SuperKey, - "ctrl": ControlKey, + //"super": SuperKey, + "ctrl": ControlKey, } func parseModifier(text string) (*Modifier, error) { @@ -84,13 +84,14 @@ func Control(key string) *Accelerator { } } -// Super creates a 'Super' Accelerator -func Super(key string) *Accelerator { - return &Accelerator{ - Key: strings.ToLower(key), - Modifiers: []Modifier{SuperKey}, - } -} +// +//// Super creates a 'Super' Accelerator +//func Super(key string) *Accelerator { +// return &Accelerator{ +// Key: strings.ToLower(key), +// Modifiers: []Modifier{SuperKey}, +// } +//} // Combo creates an Accelerator with multiple Modifiers func Combo(key string, modifier1 Modifier, modifier2 Modifier, rest ...Modifier) *Accelerator { diff --git a/v2/pkg/menu/keys/stringify.go b/v2/pkg/menu/keys/stringify.go index 09be51a3..ccc8c5e9 100644 --- a/v2/pkg/menu/keys/stringify.go +++ b/v2/pkg/menu/keys/stringify.go @@ -11,21 +11,21 @@ var modifierStringMap = map[string]map[Modifier]string{ ControlKey: "Ctrl", OptionOrAltKey: "Alt", ShiftKey: "Shift", - SuperKey: "Win", + //SuperKey: "Win", }, "darwin": { CmdOrCtrlKey: "Cmd", ControlKey: "Ctrl", OptionOrAltKey: "Option", ShiftKey: "Shift", - SuperKey: "Cmd", + //SuperKey: "Cmd", }, "linux": { CmdOrCtrlKey: "Ctrl", ControlKey: "Ctrl", OptionOrAltKey: "Alt", ShiftKey: "Shift", - SuperKey: "Super", + //SuperKey: "Super", }, }