Changeset 64205 in webkit

Timestamp:

Jul 28, 2010 8:19:23 AM (14 years ago)

Author:

jcivelli@chromium.org

Message:

2010-07-28 Jay Civelli <​jcivelli@chromium.org>

Reviewed by Kent Tamura.

[Chromium] The popup now layouts properly its rows by
taking into account the label width.
​https://bugs.webkit.org/show_bug.cgi?id=42910

• platform/chromium/PopupMenuChromium.cpp: (WebCore::PopupListBox::layout):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/chromium/PopupMenuChromium.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-28  Jay Civelli  <jcivelli@chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        [Chromium] The popup now layouts properly its rows by
+        taking into account the label width.
+        https://bugs.webkit.org/show_bug.cgi?id=42910
+
+        * platform/chromium/PopupMenuChromium.cpp:
+        (WebCore::PopupListBox::layout):
+
 2010-07-28  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/WebCore/platform/chromium/PopupMenuChromium.cpp

@@ -1257 +1257 @@
         // Ensure the popup is wide enough to fit this item.
         String text = m_popupClient->itemText(i);
-        if (!text.isEmpty()) {
-            int width = itemFont.width(TextRun(text));
-            baseWidth = max(baseWidth, width);
+        String label = m_popupClient->itemLabel(i);
+        int width = 0;
+        if (!text.isEmpty())
+            width = itemFont.width(TextRun(text));
+        if (!label.isEmpty()) {
+            if (width > 0)
+                width += kTextToLabelPadding;
+            width += itemFont.width(TextRun(label));
         }
+        baseWidth = max(baseWidth, width);
         // FIXME: http://b/1210481 We should get the padding of individual option elements.
         paddingWidth = max(paddingWidth,