Changeset 46593 in webkit

Timestamp:

Jul 30, 2009 12:07:36 PM (15 years ago)

Author:

treat@webkit.org

Message:

2009-07-30 Mike Fenton <​mike.fenton@torchmobile.com>

Reviewed by Adam Treat.

Add previously defined out support to PopupMenuQt for marking entries as
disabled and for selecting the desired item.

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

• platform/qt/PopupMenuQt.cpp: (WebCore::PopupMenu::populate):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/qt/PopupMenuQt.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-07-30  Mike Fenton  <mike.fenton@torchmobile.com>
+
+         Reviewed by Adam Treat.
+
+         Add previously defined out support to PopupMenuQt for marking entries as
+         disabled and for selecting the desired item.
+
+         https://bugs.webkit.org/show_bug.cgi?id=27772
+
+         * platform/qt/PopupMenuQt.cpp:
+         (WebCore::PopupMenu::populate):
+
 2009-07-30  Darin Adler  <darin@apple.com>
 

trunk/WebCore/platform/qt/PopupMenuQt.cpp

@@ -39 +39 @@
 #include <QMenu>
 #include <QPoint>
+#include <QStandardItemModel>
 #include <QWidgetAction>
 
@@ -64 +65 @@
     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
+        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);
+        }
     }
 }