Changeset 72202 in webkit

Timestamp:

Nov 17, 2010 5:50:16 AM (13 years ago)

Author:

benjamin.poulain@nokia.com

Message:

[Qt] [WK2] The focus switching does not seems to work with QGraphicsWKView
​https://bugs.webkit.org/show_bug.cgi?id=49545

Reviewed by Kenneth Rohde Christiansen.

Implement focus switching with Tab. This is now done asynchronously,
waiting for webkit to call takeFocus() and switching the widget.

Since the focus can change between the Tab press and the callback,
QGraphicsWKView::focusNextPrevChildCallback() make sure the view still has
focus before passing it to the next widget.

• UIProcess/API/qt/qgraphicswkview.cpp:

(QGraphicsWKView::QGraphicsWKView):
(QGraphicsWKView::focusNextPrevChildCallback):
(QGraphicsWKView::focusNextPrevChild):

• UIProcess/API/qt/qgraphicswkview.h:
• UIProcess/API/qt/qwkpage.cpp:

(QWKPagePrivate::takeFocus):

• UIProcess/API/qt/qwkpage.h:
• UIProcess/API/qt/qwkpage_p.h:

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/qt/qgraphicswkview.cpp (modified) (2 diffs)
• UIProcess/API/qt/qgraphicswkview.h (modified) (1 diff)
• UIProcess/API/qt/qwkpage.cpp (modified) (1 diff)
• UIProcess/API/qt/qwkpage.h (modified) (1 diff)
• UIProcess/API/qt/qwkpage_p.h (modified) (1 diff)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-11-17  Benjamin Poulain  <benjamin.poulain@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] [WK2] The focus switching does not seems to work with QGraphicsWKView
+        https://bugs.webkit.org/show_bug.cgi?id=49545
+
+        Implement focus switching with Tab. This is now done asynchronously,
+        waiting for webkit to call takeFocus() and switching the widget.
+
+        Since the focus can change between the Tab press and the callback,
+        QGraphicsWKView::focusNextPrevChildCallback() make sure the view still has
+        focus before passing it to the next widget.
+
+        * UIProcess/API/qt/qgraphicswkview.cpp:
+        (QGraphicsWKView::QGraphicsWKView):
+        (QGraphicsWKView::focusNextPrevChildCallback):
+        (QGraphicsWKView::focusNextPrevChild):
+        * UIProcess/API/qt/qgraphicswkview.h:
+        * UIProcess/API/qt/qwkpage.cpp:
+        (QWKPagePrivate::takeFocus):
+        * UIProcess/API/qt/qwkpage.h:
+        * UIProcess/API/qt/qwkpage_p.h:
+
 2010-11-17  Andreas Kling  <kling@webkit.org>
 

trunk/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp

@@ -89 +89 @@
     connect(d->page, SIGNAL(urlChanged(const QUrl&)), this, SIGNAL(urlChanged(const QUrl&)));
     connect(d->page, SIGNAL(cursorChanged(const QCursor&)), this, SLOT(updateCursor(const QCursor&)));
+    connect(d->page, SIGNAL(focusNextPrevChild(bool)), this, SLOT(focusNextPrevChildCallback(bool)));
 }
 
@@ -167 +168 @@
 {
     setCursor(cursor);
+}
+
+class FriendlyWidget : public QWidget
+{
+public:
+    bool focusNextPrevChild(bool next);
+};
+
+void QGraphicsWKView::focusNextPrevChildCallback(bool next)
+{
+    if (hasFocus()) {
+        // find the view which has the focus:
+        QList<QGraphicsView*> views = scene()->views();
+        const int viewCount = views.count();
+        QGraphicsView* focusedView = 0;
+        for (int i = 0; i < viewCount; ++i) {
+            if (views[i]->hasFocus()) {
+                focusedView = views[i];
+                break;
+            }
+        }
+
+        if (focusedView) {
+            QWidget* window = focusedView->window();
+            FriendlyWidget* friendlyWindow = static_cast<FriendlyWidget*>(window);
+            friendlyWindow->focusNextPrevChild(next);
+        }
+    }
+}
+
+/*! \reimp
+*/
+bool QGraphicsWKView::focusNextPrevChild(bool next)
+{
+    QKeyEvent ev(QEvent::KeyPress, Qt::Key_Tab, Qt::KeyboardModifiers(next ? Qt::NoModifier : Qt::ShiftModifier));
+    page()->d->keyPressEvent(&ev);
+    return true;
 }
 

trunk/WebKit2/UIProcess/API/qt/qgraphicswkview.h

@@ -82 +82 @@
 
     Q_SLOT void updateCursor(const QCursor&);
+    Q_SLOT void focusNextPrevChildCallback(bool next);
 
+    virtual bool focusNextPrevChild(bool next);
     virtual void focusInEvent(QFocusEvent*);
     virtual void focusOutEvent(QFocusEvent*);

trunk/WebKit2/UIProcess/API/qt/qwkpage.cpp

@@ -97 +97 @@
     viewportArguments = args;
     emit q->viewportChangeRequested();
+}
+
+void QWKPagePrivate::takeFocus(bool direction)
+{
+    emit q->focusNextPrevChild(direction);
 }
 

trunk/WebKit2/UIProcess/API/qt/qwkpage.h

@@ -119 +119 @@
     Q_SIGNAL void windowCloseRequested();
     Q_SIGNAL void zoomableAreaFound(const QRect&);
+    Q_SIGNAL void focusNextPrevChild(bool);
 
 protected:

trunk/WebKit2/UIProcess/API/qt/qwkpage_p.h

@@ -56 +56 @@
     virtual void setCursor(const WebCore::Cursor&);
     virtual void setViewportArguments(const WebCore::ViewportArguments&);
-    virtual void takeFocus(bool direction) { }
+    virtual void takeFocus(bool direction);
     virtual void toolTipChanged(const WTF::String&, const WTF::String&);
     virtual void registerEditCommand(PassRefPtr<WebKit::WebEditCommandProxy>, WebKit::WebPageProxy::UndoOrRedo);