mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #125 from atom/dont-map-meta

Browse source 
Don't map command to ctrl
This commit is contained in:
Cheng Zhao 2013-11-20 06:35:20 -08:00
commit ec880d64bf
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
browser/ui/accelerator_util.cc
View file

@ -108,13 +108,7 @@ bool StringToAccelerator(const std::string& description,
} else if (tokens[i] == "ctrl") { } else if (tokens[i] == "ctrl") {
modifiers |= ui::EF_CONTROL_DOWN; modifiers |= ui::EF_CONTROL_DOWN;
} else if (tokens[i] == "command") { } else if (tokens[i] == "command") {
// The "Command" would be translated to "Ctrl" on platforms other than
// OS X.
#if defined(OS_MACOSX)
modifiers |= ui::EF_COMMAND_DOWN; modifiers |= ui::EF_COMMAND_DOWN;
#else
modifiers |= ui::EF_CONTROL_DOWN;
#endif
} else if (tokens[i] == "alt") { } else if (tokens[i] == "alt") {
modifiers |= ui::EF_ALT_DOWN; modifiers |= ui::EF_ALT_DOWN;
} else if (tokens[i] == "shift") { } else if (tokens[i] == "shift") {