From 552c6b871194a7f6a959f070ee828e647a1433ae Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Tue, 23 Feb 2021 18:57:59 +1100 Subject: [PATCH] fix: modifiers --- v2/internal/ffenestri/menu_darwin.c | 3 ++- v2/pkg/menu/keys/keys.go | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/v2/internal/ffenestri/menu_darwin.c b/v2/internal/ffenestri/menu_darwin.c index b99ad76e..dd4eb987 100644 --- a/v2/internal/ffenestri/menu_darwin.c +++ b/v2/internal/ffenestri/menu_darwin.c @@ -508,6 +508,7 @@ unsigned long parseModifiers(const char **modifiers) { const char *thisModifier = modifiers[0]; int count = 0; while( thisModifier != NULL ) { + // Determine flags if( STREQ(thisModifier, "cmdorctrl") ) { result |= NSEventModifierFlagCommand; @@ -521,7 +522,7 @@ unsigned long parseModifiers(const char **modifiers) { if( STREQ(thisModifier, "super") ) { result |= NSEventModifierFlagCommand; } - if( STREQ(thisModifier, "control") ) { + if( STREQ(thisModifier, "ctrl") ) { result |= NSEventModifierFlagControl; } count++; diff --git a/v2/pkg/menu/keys/keys.go b/v2/pkg/menu/keys/keys.go index 60955274..5b0fe32a 100644 --- a/v2/pkg/menu/keys/keys.go +++ b/v2/pkg/menu/keys/keys.go @@ -10,15 +10,15 @@ type Modifier string const ( // CmdOrCtrlKey represents Command on Mac and Control on other platforms - CmdOrCtrlKey Modifier = "CmdOrCtrl" + CmdOrCtrlKey Modifier = "cmdorctrl" // OptionOrAltKey represents Option on Mac and Alt on other platforms - OptionOrAltKey Modifier = "OptionOrAlt" + OptionOrAltKey Modifier = "optionoralt" // ShiftKey represents the shift key on all systems - ShiftKey Modifier = "Shift" + 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 = "Control" + ControlKey Modifier = "ctrl" ) var modifierMap = map[string]Modifier{