From 3f6d3b3df4b43ec0f4940dcbfadfe0000a25d0ce Mon Sep 17 00:00:00 2001 From: SangYong Park Date: Thu, 9 May 2013 21:12:14 +0900 Subject: [PATCH] Move closing clipboard code before open keypad [Title] Move closing clipboard code before open keypad [Issue#] N_SE-37944 [Problem] Clipboard did closed when device was rotated [Cause] editState was notified when device was rotated [Solution] Move closing clipboard code Change-Id: I4876d98947b60dcb59334ad647161da2e299c23a --- Source/WebKit2/UIProcess/efl/InputMethodContextEfl.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Source/WebKit2/UIProcess/efl/InputMethodContextEfl.cpp b/Source/WebKit2/UIProcess/efl/InputMethodContextEfl.cpp index 8ff196f..5c25dc7 100755 --- a/Source/WebKit2/UIProcess/efl/InputMethodContextEfl.cpp +++ b/Source/WebKit2/UIProcess/efl/InputMethodContextEfl.cpp @@ -328,13 +328,9 @@ void InputMethodContextEfl::updateTextInputState() if (editor.shouldIgnoreCompositionSelectionChange) return; - if (editor.isContentEditable && m_useInputMethod) { -#if ENABLE(TIZEN_WEBKIT2_CONTEXT_MENU_CLIPBOARD) - if (m_viewImpl->pageClient->isClipboardWindowOpened()) - m_viewImpl->pageClient->closeClipboardWindow(); -#endif + if (editor.isContentEditable && m_useInputMethod) showIMFContext(editor); - } else + else hideIMFContext(); if (m_context) @@ -559,6 +555,11 @@ void InputMethodContextEfl::showIMFContext(const EditorState& editor) return; } +#if ENABLE(TIZEN_WEBKIT2_CONTEXT_MENU_CLIPBOARD) + if (m_viewImpl->pageClient->isClipboardWindowOpened()) + m_viewImpl->pageClient->closeClipboardWindow(); +#endif + ecore_imf_context_reset(m_context.get()); ecore_imf_context_focus_in(m_context.get()); ecore_imf_context_input_panel_show(m_context.get()); -- 2.7.4