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

Fixes not being able to send UTF8 characters anymore

Browse source
This commit is contained in:
Heilig Benedek 2016-07-31 05:10:14 +02:00
commit 94e52f0738
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
atom/common/keyboard_util.cc
View file

@ -159,7 +159,8 @@ ui::KeyboardCode KeyboardCodeFromKeyIdentifier(const std::string& s,
return ui::VKEY_UNKNOWN; return ui::VKEY_UNKNOWN;
} }
} else { } else {
LOG(WARNING) << "Invalid accelerator token: " << str; if (str.size() > 2)
LOG(WARNING) << "Invalid accelerator token: " << str;
return ui::VKEY_UNKNOWN; return ui::VKEY_UNKNOWN;
} }
} }

7
atom/common/native_mate_converters/blink_converter.cc
View file

@ -176,9 +176,10 @@ bool Converter<blink::WebKeyboardEvent>::FromV8(
out->setKeyIdentifierFromWindowsKeyCode(); out->setKeyIdentifierFromWindowsKeyCode();
if ((out->type == blink::WebInputEvent::Char || if ((out->type == blink::WebInputEvent::Char ||
out->type == blink::WebInputEvent::RawKeyDown) && out->type == blink::WebInputEvent::RawKeyDown) &&
str.size() == 1) { str.size() <= 2) {
out->text[0] = str[0]; base::string16 code = base::UTF8ToUTF16(str);
out->unmodifiedText[0] = str[0]; out->text[0] = code[0];
out->unmodifiedText[0] = code[0];
} }
return true; return true;
} }