Changeset 52151 in webkit

Timestamp:

Dec 15, 2009 8:13:51 AM (14 years ago)

Author:

eric@webkit.org

Message:

2009-12-15 Luiz Agostini <​luiz.agostini@openbossa.org>

Reviewed by Kenneth Rohde Christiansen.

Moving list populate methods from PopupMenuQt to QWebPopup.

In preparation to future implementation of a delegation API for the combobox.

• platform/PopupMenu.h:
• platform/qt/PopupMenuQt.cpp: (WebCore::PopupMenu::show): (WebCore::PopupMenu::hide):
• platform/qt/QWebPopup.cpp: (WebCore::QWebPopup::show): (WebCore::QWebPopup::populate):
• platform/qt/QWebPopup.h: (WebCore::QWebPopup::hide):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/PopupMenu.h (modified) (1 diff)
• platform/qt/PopupMenuQt.cpp (modified) (2 diffs)
• platform/qt/QWebPopup.cpp (modified) (3 diffs)
• platform/qt/QWebPopup.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-15  Luiz Agostini  <luiz.agostini@openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Moving list populate methods from PopupMenuQt to QWebPopup.
+        
+        In preparation to future implementation of a delegation API for the combobox.
+
+        * platform/PopupMenu.h:
+        * platform/qt/PopupMenuQt.cpp:
+        (WebCore::PopupMenu::show):
+        (WebCore::PopupMenu::hide):
+        * platform/qt/QWebPopup.cpp:
+        (WebCore::QWebPopup::show):
+        (WebCore::QWebPopup::populate):
+        * platform/qt/QWebPopup.h:
+        (WebCore::QWebPopup::hide):
+
 2009-12-15  Alexander Pavlov  <apavlov@chromium.org>
 

trunk/WebCore/platform/PopupMenu.h

@@ -145 +145 @@
     RetainPtr<NSPopUpButtonCell> m_popup;
 #elif PLATFORM(QT)
-    void clear();
-    void populate(const IntRect&);
     QWebPopup* m_popup;
 #elif PLATFORM(WIN)

trunk/WebCore/platform/qt/PopupMenuQt.cpp

@@ -27 +27 @@
 #include "PopupMenu.h"
 
-#include "Frame.h"
 #include "FrameView.h"
-#include "HostWindow.h"
 #include "PopupMenuClient.h"
-#include "QWebPageClient.h"
 #include "QWebPopup.h"
-
-#include <QAction>
-#include <QDebug>
-#include <QListWidget>
-#include <QListWidgetItem>
-#include <QMenu>
-#include <QPoint>
-#include <QStandardItemModel>
-#include <QWidgetAction>
 
 namespace WebCore {
@@ -56 +44 @@
 }
 
-void PopupMenu::clear()
-{
-    m_popup->clear();
-}
-
-void PopupMenu::populate(const IntRect&)
-{
-    clear();
-    Q_ASSERT(client());
-
-    QStandardItemModel* model = qobject_cast<QStandardItemModel*>(m_popup->model());
-    Q_ASSERT(model);
-
-    int size = client()->listSize();
-    for (int i = 0; i < size; i++) {
-        if (client()->itemIsSeparator(i))
-            m_popup->insertSeparator(i);
-        else {
-            m_popup->insertItem(i, client()->itemText(i));
-
-            if (model && !client()->itemIsEnabled(i))
-                model->item(i)->setEnabled(false);
-
-            if (client()->itemIsSelected(i))
-                m_popup->setCurrentIndex(i);
-        }
-    }
-}
-
 void PopupMenu::show(const IntRect& r, FrameView* v, int index)
 {
-    QWebPageClient* client = v->hostWindow()->platformPageClient();
-    populate(r);
     QRect rect = r;
     rect.moveTopLeft(v->contentsToWindow(r.topLeft()));
-    rect.setHeight(m_popup->sizeHint().height());
-
-    m_popup->setParent(client->ownerWidget());
-    m_popup->setGeometry(rect);
-    m_popup->setCurrentIndex(index);
-    m_popup->exec();
+    m_popup->show(rect, index);
 }
 
 void PopupMenu::hide()
 {
-    m_popup->hidePopup();
+    m_popup->hide();
 }
 

trunk/WebCore/platform/qt/QWebPopup.cpp

@@ -21 +21 @@
 #include "config.h"
 #include "QWebPopup.h"
+#include "HostWindow.h"
 #include "PopupMenuStyle.h"
+#include "QWebPageClient.h"
 
 #include <QAbstractItemView>
@@ -27 +29 @@
 #include <QInputContext>
 #include <QMouseEvent>
+#include <QStandardItemModel>
 
 namespace WebCore {
@@ -42 +45 @@
 
 
-void QWebPopup::exec()
+void QWebPopup::show(const QRect& geometry, int selectedIndex)
 {
+    populate();
+    setCurrentIndex(selectedIndex);
+
+    QWidget* parent = 0;
+    if (m_client->hostWindow() && m_client->hostWindow()->platformPageClient())
+       parent = m_client->hostWindow()->platformPageClient()->ownerWidget();
+
+    setParent(parent);
+    setGeometry(QRect(geometry.left(), geometry.top(), geometry.width(), sizeHint().height()));
+
     QMouseEvent event(QEvent::MouseButtonPress, QCursor::pos(), Qt::LeftButton,
                       Qt::LeftButton, Qt::NoModifier);
     QCoreApplication::sendEvent(this, &event);
+}
+
+void QWebPopup::populate()
+{
+    clear();
+    Q_ASSERT(m_client);
+
+    QStandardItemModel* model = qobject_cast<QStandardItemModel*>(QComboBox::model());
+    Q_ASSERT(model);
+
+    int size = m_client->listSize();
+    for (int i = 0; i < size; i++) {
+        if (m_client->itemIsSeparator(i))
+            insertSeparator(i);
+        else {
+            insertItem(i, m_client->itemText(i));
+
+            if (model && !m_client->itemIsEnabled(i))
+                model->item(i)->setEnabled(false);
+        }
+    }
 }
 

trunk/WebCore/platform/qt/QWebPopup.h

@@ -28 +28 @@
 namespace WebCore {
 
-class QWebPopup : public QComboBox {
+class QWebPopup : private QComboBox {
     Q_OBJECT
 public:
     QWebPopup(PopupMenuClient* client);
 
-    void exec();
+    void show(const QRect& geometry, int selectedIndex);
+    void hide() { hidePopup(); }
+
+private slots:
+    void activeChanged(int);
+
+private:
+    PopupMenuClient* m_client;
+    bool m_popupVisible;
+
+    void populate();
 
     virtual void showPopup();
     virtual void hidePopup();
-
-private slots:
-    void activeChanged(int);
-private:
-    PopupMenuClient* m_client;
-    bool m_popupVisible;
 };