github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-27 08:18:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

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
parent 6c0621fe05 113d644615
commit ec880d64bf
1 changed files with 0 additions and 6 deletions
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") {
modifiers |= ui::EF_CONTROL_DOWN;
} 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;
#else
modifiers |= ui::EF_CONTROL_DOWN;
#endif
} else if (tokens[i] == "alt") {
modifiers |= ui::EF_ALT_DOWN;
} else if (tokens[i] == "shift") {