github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merging keyCode and keyIdentifier and adjusting the docs accordingly

Browse Source
This commit is contained in:
Heilig Benedek
2015-11-16 14:51:26 +01:00
parent 5fff06d2c2
commit 14740eeb8a
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
atom/common/keyboad_util.cc
View File

@@ -73,7 +73,7 @@ ui::KeyboardCode KeyboardCodeFromCharCode(base::char16 c, bool* shifted) {
}
// Return key code of the char.
ui::KeyboardCode KeyboardCodeFromKeyIdentifier(std::string chr) {
ui::KeyboardCode KeyboardCodeFromKeyIdentifier(const std::string& chr) {
if (chr == "enter") return ui::VKEY_RETURN;
if (chr == "backspace") return ui::VKEY_BACK;
if (chr == "delete") return ui::VKEY_DELETE;

2
atom/common/keyboad_util.h
View File

@@ -16,7 +16,7 @@ namespace atom {
ui::KeyboardCode KeyboardCodeFromCharCode(base::char16 c, bool* shifted);
// Return key code of the char from a string representation of the char
ui::KeyboardCode KeyboardCodeFromKeyIdentifier(std::string chr);
ui::KeyboardCode KeyboardCodeFromKeyIdentifier(const std::string& chr);
} // namespace atom

2
atom/common/native_mate_converters/blink_converter.cc
View File

@@ -164,7 +164,7 @@ bool Converter<blink::WebKeyboardEvent>::FromV8(
if (dict.Get("keyCode", &code))
out->windowsKeyCode = atom::KeyboardCodeFromCharCode(code, &shifted);
else if (dict.Get("keyIdentifier", &identifier))
else if (dict.Get("keyCode", &identifier))
out->windowsKeyCode = atom::KeyboardCodeFromKeyIdentifier(
base::StringToLowerASCII(identifier));
else