Changeset 56322 in webkit

Timestamp:

Mar 21, 2010 4:21:05 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-21 Kristian Amlie <​kristian.amlie@nokia.com>

Reviewed by Simon Hausmann.

Fixed updating the VKB display when inputting into QGraphicsWebView.
​https://bugs.webkit.org/show_bug.cgi?id=36292

• Api/qgraphicswebview.cpp: (QGraphicsWebViewPrivate::_q_updateMicroFocus): (QGraphicsWebView::setPage):
• Api/qgraphicswebview.h:

Location:

trunk/WebKit/qt

Files:

• Api/qgraphicswebview.cpp (modified) (4 diffs)
• Api/qgraphicswebview.h (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/WebKit/qt/Api/qgraphicswebview.cpp

@@ -41 +41 @@
 #include <QtGui/qscrollbar.h>
 #include <QtGui/qstyleoption.h>
+#include <QtGui/qinputcontext.h>
 #if defined(Q_WS_X11)
 #include <QX11Info>
@@ -135 +136 @@
     void _q_scaleChanged();
 
+    void _q_updateMicroFocus();
+
     QGraphicsWebView* q;
     QWebPage* page;
@@ -242 +245 @@
 
     emit q->loadFinished(success);
+}
+
+void QGraphicsWebViewPrivate::_q_updateMicroFocus()
+{
+#if !defined(QT_NO_IM) && (defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN))
+    // Ideally, this should be handled by a common call to an updateMicroFocus function
+    // in QGraphicsItem. See http://bugreports.qt.nokia.com/browse/QTBUG-7578.
+    QList<QGraphicsView*> views = q->scene()->views();
+    for (int c = 0; c < views.size(); ++c) {
+        QInputContext* ic = views.at(c)->inputContext();
+        if (ic)
+            ic->update();
+    }
+#endif
 }
 
@@ -719 +736 @@
     connect(d->page, SIGNAL(linkClicked(QUrl)),
             this, SIGNAL(linkClicked(QUrl)));
+    connect(d->page, SIGNAL(microFocusChanged()),
+            this, SLOT(_q_updateMicroFocus()));
 }
 

trunk/WebKit/qt/Api/qgraphicswebview.h

@@ -143 +143 @@
 private:
     Q_PRIVATE_SLOT(d, void _q_doLoadFinished(bool success))
+    Q_PRIVATE_SLOT(d, void _q_updateMicroFocus())
     // we don't want to change the moc based on USE() macro, so this function is here
     // but will be empty if ACCLERATED_COMPOSITING is disabled

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-03-21  Kristian Amlie  <kristian.amlie@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        Fixed updating the VKB display when inputting into QGraphicsWebView.
+        https://bugs.webkit.org/show_bug.cgi?id=36292
+
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebViewPrivate::_q_updateMicroFocus):
+        (QGraphicsWebView::setPage):
+        * Api/qgraphicswebview.h:
+
 2010-03-19  Laszlo Gombos  <laszlo.1.gombos@nokia.com>