Changeset 53769 in webkit

Timestamp:

Jan 23, 2010 8:37:44 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-01-23 Girish Ramakrishnan <Girish Ramakrishnan>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Fix positioning of ComboBox popup in QGraphicsWebView.

Wrap the popup in a QGraphicsProxyWidget, so that the popup
transforms with the item.

​https://bugs.webkit.org/show_bug.cgi?id=33887

• WebCoreSupport/QtFallbackWebPopup.cpp: (WebCore::QtFallbackWebPopupCombo::hidePopup): (WebCore::QtFallbackWebPopup::QtFallbackWebPopup): (WebCore::QtFallbackWebPopup::~QtFallbackWebPopup): (WebCore::QtFallbackWebPopup::show):
• WebCoreSupport/QtFallbackWebPopup.h:

Location:

trunk/WebKit/qt

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/QtFallbackWebPopup.cpp (modified) (6 diffs)
• WebCoreSupport/QtFallbackWebPopup.h (modified) (2 diffs)

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-01-23  Girish Ramakrishnan  <girish@forwardbias.in>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Fix positioning of ComboBox popup in QGraphicsWebView.
+        
+        Wrap the popup in a QGraphicsProxyWidget, so that the popup
+        transforms with the item.
+        
+        https://bugs.webkit.org/show_bug.cgi?id=33887
+
+        * WebCoreSupport/QtFallbackWebPopup.cpp:
+        (WebCore::QtFallbackWebPopupCombo::hidePopup):
+        (WebCore::QtFallbackWebPopup::QtFallbackWebPopup):
+        (WebCore::QtFallbackWebPopup::~QtFallbackWebPopup):
+        (WebCore::QtFallbackWebPopup::show):
+        * WebCoreSupport/QtFallbackWebPopup.h:
+
 2010-01-22  Peter Kasting  <pkasting@google.com>
 

trunk/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp

@@ -1 +1 @@
 /*
+ * Copyright (C) 2010 Girish Ramakrishnan <girish@forwardbias.in>
  * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
  *
@@ -23 +24 @@
 #include "HostWindow.h"
 #include "PopupMenuClient.h"
+#include "qgraphicswebview.h"
 #include "QWebPageClient.h"
 #include <QAbstractItemView>
 #include <QApplication>
+#include <QGraphicsProxyWidget>
+#include <QGraphicsScene>
+#include <QGraphicsView>
 #include <QInputContext>
 #include <QMouseEvent>
@@ -56 +61 @@
 
     QComboBox::hidePopup();
+
+    if (QGraphicsProxyWidget* proxy = graphicsProxyWidget())
+        proxy->setVisible(false);
+
     if (!m_ownerPopup.m_popupVisible)
         return;
@@ -69 +78 @@
     , m_popupVisible(false)
     , m_combo(new QtFallbackWebPopupCombo(*this))
+    , m_proxy(0)
 {
     connect(m_combo, SIGNAL(activated(int)),
@@ -76 +86 @@
 QtFallbackWebPopup::~QtFallbackWebPopup()
 {
-    delete m_combo;
+    // If we create a proxy, then the deletion of the proxy and the
+    // combo will be done by the proxy's parent (QGraphicsWebView)
+    if (!m_proxy)
+        delete m_combo;
 }
 
@@ -82 +95 @@
 {
     populate();
-    m_combo->setParent(pageClient()->ownerWidget());
     m_combo->setCurrentIndex(currentIndex());
+    QRect rect = geometry();
+    if (QGraphicsWebView *webView = qobject_cast<QGraphicsWebView*>(pageClient()->pluginParent())) {
+        if (!m_proxy) {
+            m_proxy = new QGraphicsProxyWidget(webView);
+            m_proxy->setWidget(m_combo);
+        } else
+            m_proxy->setVisible(true);
+        m_proxy->setGeometry(rect);
+    } else {
+        m_combo->setParent(pageClient()->ownerWidget());
+        m_combo->setGeometry(QRect(rect.left(), rect.top(),
+                               rect.width(), m_combo->sizeHint().height()));
 
-    QRect rect = geometry();
-    m_combo->setGeometry(QRect(rect.left(), rect.top(),
-                               rect.width(), m_combo->sizeHint().height()));
+    }
 
     QMouseEvent event(QEvent::MouseButtonPress, QCursor::pos(), Qt::LeftButton,

trunk/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.h

@@ -24 +24 @@
 #include <QComboBox>
 
+class QGraphicsProxyWidget;
+
 namespace WebCore {
 
@@ -44 +46 @@
     bool m_popupVisible;
     QtFallbackWebPopupCombo* m_combo;
+    QGraphicsProxyWidget* m_proxy;
 
     void populate();