Changeset 56980 in webkit

Timestamp:

Apr 2, 2010 12:39:29 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-02 Luiz Agostini <​luiz.agostini@openbossa.org>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Maemo5 theme - customized popup for <select multiple> elements
​https://bugs.webkit.org/show_bug.cgi?id=36368

Using QtMaemoWebPopup instead of QtFallbackWebPopup for Maemo.

• WebCoreSupport/ChromeClientQt.cpp: (WebCore::ChromeClientQt::createSelectPopup):
• WebCoreSupport/QtFallbackWebPopup.cpp: (WebCore::QtFallbackWebPopup::show): (WebCore::QtFallbackWebPopup::populate):

Location:

trunk/WebKit/qt

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/ChromeClientQt.cpp (modified) (2 diffs)
• WebCoreSupport/QtFallbackWebPopup.cpp (modified) (3 diffs)

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-04-02  Luiz Agostini  <luiz.agostini@openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Maemo5 theme - customized popup for <select multiple> elements
+        https://bugs.webkit.org/show_bug.cgi?id=36368
+
+        Using QtMaemoWebPopup instead of QtFallbackWebPopup for Maemo.
+
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::createSelectPopup):
+        * WebCoreSupport/QtFallbackWebPopup.cpp:
+        (WebCore::QtFallbackWebPopup::show):
+        (WebCore::QtFallbackWebPopup::populate):
+
 2010-04-01  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
 

trunk/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp

@@ -42 +42 @@
 #include "WindowFeatures.h"
 #include "DatabaseTracker.h"
+#if defined(Q_WS_MAEMO_5)
+#include "QtMaemoWebPopup.h"
+#else
 #include "QtFallbackWebPopup.h"
+#endif
 #include "QWebPageClient.h"
 #include "SecurityOrigin.h"
@@ -543 +547 @@
 QtAbstractWebPopup* ChromeClientQt::createSelectPopup()
 {
+#if defined(Q_WS_MAEMO_5)
+    return new QtMaemoWebPopup;
+#else
     return new QtFallbackWebPopup;
+#endif
 }
 

trunk/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp

@@ -109 +109 @@
     m_combo->setCurrentIndex(currentIndex());
 
-#if defined(Q_WS_MAEMO_5)
-    // Comboboxes with Qt on Maemo 5 come up in their full width on the screen, so neither
-    // the proxy widget, nor the coordinates are needed.
-    m_combo->setParent(pageClient()->ownerWidget());
-    m_combo->showPopup();
-    return;
-#endif
-
     QRect rect = geometry();
     if (QGraphicsWebView *webView = qobject_cast<QGraphicsWebView*>(pageClient()->pluginParent())) {
@@ -132 +124 @@
     }
 
-    // QCursor::pos() is not a great idea for a touch screen, but as Maemo 5 is handled
-    // separately above, this should be okay.
     QMouseEvent event(QEvent::MouseButtonPress, QCursor::pos(), Qt::LeftButton,
                       Qt::LeftButton, Qt::NoModifier);
@@ -205 +195 @@
     Q_ASSERT(model);
 
-#if !defined(Q_WS_S60) && !defined(Q_WS_MAEMO_5)
+#if !defined(Q_WS_S60)
     m_combo->setFont(font());
 #endif