Changeset 127597 in webkit

Timestamp:

Sep 5, 2012 8:58:09 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[chromium] Unify size of popup menu for touch and non-touch.
​https://bugs.webkit.org/show_bug.cgi?id=95606

Patch by Kevin Ellis <​kevers@chromium.org> on 2012-09-05
Reviewed by Adam Barth.

Use minimum height for popup menus entries regardless of whether the
popup menu is displayed on a touch screen. Replaces use of touch
padding. Height meets minimum size requirement for a low error rate
while still looking aesthetic for non-touch.

Covered by existing tests.

• platform/chromium/PopupListBox.cpp:

(WebCore::PopupListBox::getRowHeight):

• platform/chromium/PopupMenuChromium.cpp:

(WebCore):

• platform/chromium/PopupMenuChromium.h:

(PopupMenuChromium):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/chromium/PopupListBox.cpp (modified) (2 diffs)
• platform/chromium/PopupMenuChromium.cpp (modified) (1 diff)
• platform/chromium/PopupMenuChromium.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-05  Kevin Ellis  <kevers@chromium.org>
+
+        [chromium] Unify size of popup menu for touch and non-touch.
+        https://bugs.webkit.org/show_bug.cgi?id=95606
+
+        Reviewed by Adam Barth.
+
+        Use minimum height for popup menus entries regardless of whether the
+        popup menu is displayed on a touch screen.  Replaces use of touch
+        padding.  Height meets minimum size requirement for a low error rate
+        while still looking aesthetic for non-touch.
+
+        Covered by existing tests.
+
+        * platform/chromium/PopupListBox.cpp:
+        (WebCore::PopupListBox::getRowHeight):
+        * platform/chromium/PopupMenuChromium.cpp:
+        (WebCore):
+        * platform/chromium/PopupMenuChromium.h:
+        (PopupMenuChromium):
+
 2012-09-05  Mihnea Ovidenie  <mihnea@adobe.com>
 

trunk/Source/WebCore/platform/chromium/PopupListBox.cpp

@@ -615 +615 @@
 int PopupListBox::getRowHeight(int index)
 {
-    int paddingForTouch = 0;
-    if (m_settings.deviceSupportsTouch)
-        paddingForTouch = PopupMenuChromium::optionPaddingForTouch();
     if (index < 0 || m_popupClient->itemStyle(index).isDisplayNone())
         return PopupMenuChromium::minimumRowHeight();
@@ -633 +630 @@
     int linePaddingHeight = m_popupClient->menuStyle().menuType() == PopupMenuStyle::AutofillPopup ? kLinePaddingHeight : 0;
     int calculatedRowHeight = max(fontHeight, iconHeight) + linePaddingHeight * 2;
-    return (max(calculatedRowHeight, PopupMenuChromium::minimumRowHeight()) + paddingForTouch);
+    return max(calculatedRowHeight, PopupMenuChromium::minimumRowHeight());
 }
 

trunk/Source/WebCore/platform/chromium/PopupMenuChromium.cpp

@@ -41 +41 @@
 namespace WebCore {
 
-int PopupMenuChromium::s_minimumRowHeight = 0;
-int PopupMenuChromium::s_optionPaddingForTouch = 16;
+int PopupMenuChromium::s_minimumRowHeight = 28;
 
 // The settings used for the drop down menu.

trunk/Source/WebCore/platform/chromium/PopupMenuChromium.h

@@ -58 +58 @@
     static void setMinimumRowHeight(int minimumRowHeight) { s_minimumRowHeight = minimumRowHeight; }
 
-    static int optionPaddingForTouch() { return s_optionPaddingForTouch; }
-    static void setOptionPaddingForTouch(int optionPaddingForTouch) { s_optionPaddingForTouch = optionPaddingForTouch; }
-
 private:
     PopupMenuClient* client() const { return m_popupClient; }
@@ -68 +65 @@
 
     static int s_minimumRowHeight;
-    static int s_optionPaddingForTouch;
 };