bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge revision 1009 changes: 

- Enable IME for all text input types (issue #765).

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1364@1010 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2013-01-17 19:01:50 +00:00
parent 6990820200
commit 29eaeea0d6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cef1/libcef/webwidget_host_win.cc
View File

@ -985,7 +985,7 @@ void WebWidgetHost::UpdateImeInputState() {
if (text_input_type_ != type) { if (text_input_type_ != type) {
text_input_type_ = type; text_input_type_ = type;
if (type == WebKit::WebTextInputTypeText) if (type != WebKit::WebTextInputTypeNone)
ime_input_.EnableIME(view_); ime_input_.EnableIME(view_);
else else
ime_input_.DisableIME(view_); ime_input_.DisableIME(view_);
@ -993,7 +993,7 @@ void WebWidgetHost::UpdateImeInputState() {
// Only update caret position if the input method is enabled and the caret // Only update caret position if the input method is enabled and the caret
// position has changed. // position has changed.
if (type == WebKit::WebTextInputTypeText && caret_bounds != caret_bounds_) { if (type != WebKit::WebTextInputTypeNone && caret_bounds != caret_bounds_) {
caret_bounds_ = caret_bounds; caret_bounds_ = caret_bounds;
ime_input_.UpdateCaretRect(view_, caret_bounds); ime_input_.UpdateCaretRect(view_, caret_bounds);
} }