[webkit-changes] [115973] trunk/Source/WebKit2

[commit-queue]

Title: [115973] trunk/Source/WebKit2

Revision

115973

Author

commit-qu...@webkit.org

Date

2012-05-03 08:15:40 -0700 (Thu, 03 May 2012)

Log Message

[Qt][WK2] Also update Qt::ImEnabled flag when updating the input method.
https://bugs.webkit.org/show_bug.cgi?id=85495

Patch by Michael Brüning <michael.brun...@nokia.com> on 2012-05-03
Reviewed by Simon Hausmann.

QInputMethod only issues a new inputMethodQuery if the Qt::ImEnabled
flag got updated as well.

* UIProcess/qt/QtWebPageEventHandler.cpp:
(WebKit::QtWebPageEventHandler::updateTextInputState):
(WebKit::QtWebPageEventHandler::doneWithGestureEvent):

Modified Paths

• trunk/Source/WebKit2/ChangeLog
• trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp

Diff

Modified: trunk/Source/WebKit2/ChangeLog (115972 => 115973)

--- trunk/Source/WebKit2/ChangeLog	2012-05-03 15:11:27 UTC (rev 115972)
+++ trunk/Source/WebKit2/ChangeLog	2012-05-03 15:15:40 UTC (rev 115973)
@@ -1,3 +1,17 @@
+2012-05-03  Michael Brüning  <michael.brun...@nokia.com>
+
+        [Qt][WK2] Also update Qt::ImEnabled flag when updating the input method.
+        https://bugs.webkit.org/show_bug.cgi?id=85495
+
+        Reviewed by Simon Hausmann.
+
+        QInputMethod only issues a new inputMethodQuery if the Qt::ImEnabled
+        flag got updated as well.
+
+        * UIProcess/qt/QtWebPageEventHandler.cpp:
+        (WebKit::QtWebPageEventHandler::updateTextInputState):
+        (WebKit::QtWebPageEventHandler::doneWithGestureEvent):
+
 2012-05-03  Allan Sandfeld Jensen  <allan.jen...@nokia.com>
 
         [Qt] Tap-highlight blinks when activated.

Modified: trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp (115972 => 115973)

--- trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp	2012-05-03 15:11:27 UTC (rev 115972)
+++ trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp	2012-05-03 15:15:40 UTC (rev 115973)
@@ -414,11 +414,9 @@
     if (!m_webView->hasActiveFocus())
         return;
 
-    qApp->inputPanel()->update(Qt::ImQueryInput);
+    qApp->inputPanel()->update(Qt::ImQueryInput | Qt::ImEnabled);
 
-    // Ignore input method requests not due to a tap gesture.
-    if (!editor.isContentEditable)
-        setInputPanelVisible(false);
+    setInputPanelVisible(editor.isContentEditable);
 }
 
 void QtWebPageEventHandler::doneWithGestureEvent(const WebGestureEvent& event, bool wasEventHandled)
@@ -431,10 +429,7 @@
     if (!wasEventHandled || !m_webView->hasActiveFocus())
         return;
 
-    qApp->inputPanel()->update(Qt::ImQueryInput);
-    const EditorState& editor = m_webPageProxy->editorState();
-    bool newVisible = editor.isContentEditable;
-    setInputPanelVisible(newVisible);
+    updateTextInputState();
 }
 
 #if ENABLE(TOUCH_EVENTS)

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes