fixed bugs of modifiers of nw.MenuItem

Cong Liu · rogerwang · commit e3159b461461 · 2016-11-23T09:48:41.000+08:00
* modifiers should be case insensitive * command and super should be supported same as cmd on macOS fixed nwjs#5451
diff --git a/src/api/menuitem/menuitem.cc b/src/api/menuitem/menuitem.cc
@@ -33,8 +33,8 @@ namespace nw {
 namespace {
 
 typedef std::map<std::string,std::string> KeyMap;
-/*
-{
+
+static KeyMap keymap = {
   {"`"    , "Backquote"},
   {"\\"   , "Backslash"},
   {"["    , "BracketLeft"},
@@ -56,34 +56,6 @@ typedef std::map<std::string,std::string> KeyMap;
   {"MEDIANEXTTRACK", "MediaTrackNext"},
   {"MEDIAPREVTRACK", "MediaTrackPrevious"}
 };
-*/
-
-static KeyMap InitKeyMap() {
-  KeyMap result;
-  result["`"] = "Backquote";
-  result["\\"] = "Backslash";
-  result["["] = "BracketLeft";
-  result["]"] = "BracketRight";
-  result[","] = "Comma";
-  result["="] = "Equal";
-  result["-"] = "Minus";
-  result["."] = "Period";
-  result["'"] = "Quote";
-  result[";"] = "Semicolon";
-  result["/"] = "Slash";
-  result["\n"] = "Enter";
-  result["\t"] = "Tab";
-  result["UP"] = "ArrowUp";
-  result["DOWN"] = "ArrowDown";
-  result["LEFT"] = "ArrowLeft";
-  result["RIGHT"] = "ArrowRight";
-  result["ESC"] = "Escape";
-  result["MEDIANEXTTRACK"] = "MediaTrackNext";
-  result["MEDIAPREVTRACK"] = "MediaTrackPrevious";
-  return result;
-}
-
-static KeyMap keymap = InitKeyMap();
 
 }
 
diff --git a/src/api/menuitem/menuitem_mac.mm b/src/api/menuitem/menuitem_mac.mm
@@ -208,10 +208,12 @@
 
 void MenuItem::SetModifiers(const std::string& modifiers) {
   NSUInteger mask = 0;
-  NSString* nsmodifiers = [NSString stringWithUTF8String:modifiers.c_str()];
+  NSString* nsmodifiers = [NSString stringWithUTF8String:modifiers.c_str()].lowercaseString;
   if([nsmodifiers rangeOfString:@"shift"].location != NSNotFound)
     mask = mask|NSShiftKeyMask;
-  if([nsmodifiers rangeOfString:@"cmd"].location != NSNotFound)
+  if([nsmodifiers rangeOfString:@"cmd"].location != NSNotFound
+    || [nsmodifiers rangeOfString:@"command"].location != NSNotFound
+    || [nsmodifiers rangeOfString:@"super"].location != NSNotFound)
     mask = mask|NSCommandKeyMask;
   if([nsmodifiers rangeOfString:@"alt"].location != NSNotFound)
     mask = mask|NSAlternateKeyMask;
diff --git a/src/api/menuitem/menuitem_views.cc b/src/api/menuitem/menuitem_views.cc
@@ -21,6 +21,7 @@
 #include "content/nw/src/api/menuitem/menuitem.h"
 
 #include "base/files/file_path.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/values.h"
@@ -74,6 +75,7 @@ void MenuItem::Create(const base::DictionaryValue& option) {
     enable_shortcut_ = true;
     //only code for ctrl, shift, alt, super and meta modifiers
     int modifiers_value = ui::EF_NONE;
+    modifiers = base::ToLowerASCII(modifiers);
     if (modifiers.find("ctrl")!=std::string::npos){
       modifiers_value |= ui::EF_CONTROL_DOWN;
     }
