Win: Erase in-progress IME composition on cancel (issue #701).
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@803 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
parent
2cfc1fefc0
commit
d3dafb3073
|
@ -942,14 +942,14 @@ LRESULT WebWidgetHost::OnImeEndComposition(UINT message, WPARAM wparam,
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if (ime_input_.is_composing()) {
|
if (ime_input_.is_composing()) {
|
||||||
// A composition has been ended while there is an ongoing composition,
|
webwidget_->setComposition(WebKit::WebString(),
|
||||||
// i.e. the ongoing composition has been canceled.
|
std::vector<WebKit::WebCompositionUnderline>(),
|
||||||
// Reset the composition status of both of the ImeInput object and the
|
0, 0);
|
||||||
// window.
|
|
||||||
ime_input_.CancelIME(view_);
|
|
||||||
ime_input_.ResetComposition(view_);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ime_input_.ResetComposition(view_);
|
||||||
ime_input_.DestroyImeWindow(view_);
|
ime_input_.DestroyImeWindow(view_);
|
||||||
|
|
||||||
// Let WTL call ::DefWindowProc() and release its resources.
|
// Let WTL call ::DefWindowProc() and release its resources.
|
||||||
handled = FALSE;
|
handled = FALSE;
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in New Issue