Changeset 57992 in webkit

Timestamp:

Apr 21, 2010 10:30:09 AM (14 years ago)

Author:

xji@chromium.org

Message:

2010-04-21 Xiaomei Ji <​xji@chromium.org>

Reviewed by Dimitri Glazkov

This patch fixes [chromium] RTL <select> dropdown box expands to right
instead of left.
​https://bugs.webkit.org/show_bug.cgi?id=37232

No automatic test is possible.

• manual-tests/select_dropdown_box_alignment.html: Added.
• platform/chromium/PopupMenuChromium.cpp: (WebCore::PopupContainer::layout): Adjust the x-axis of dropdown box for RTL.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• manual-tests/select_dropdown_box_alignment.html (added)
• platform/chromium/PopupMenuChromium.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-21  Xiaomei Ji  <xji@chromium.org>
+
+        Reviewed by Dimitri Glazkov
+
+        This patch fixes [chromium] RTL <select> dropdown box expands to right
+        instead of left.
+        https://bugs.webkit.org/show_bug.cgi?id=37232
+
+        No automatic test is possible.
+
+        * manual-tests/select_dropdown_box_alignment.html: Added.
+        * platform/chromium/PopupMenuChromium.cpp:
+        (WebCore::PopupContainer::layout): Adjust the x-axis of dropdown box 
+        for RTL.
+
 2010-04-21  anton muhin  <antonm@google.com>
 

trunk/WebCore/platform/chromium/PopupMenuChromium.cpp

@@ -432 +432 @@
     m_listBox->move(kBorderSize, kBorderSize);
 
+    // popupWidth is the width of <select> element. Record it before resize frame.
+    int popupWidth = frameRect().width();
     // Size ourselves to contain listbox + border.
-    resize(m_listBox->width() + kBorderSize * 2, m_listBox->height() + kBorderSize * 2);
-
+    int listBoxWidth = m_listBox->width() + kBorderSize * 2;
+    resize(listBoxWidth, m_listBox->height() + kBorderSize * 2);
+
+    // Adjust the starting x-axis for RTL dropdown. For RTL dropdown, the right edge
+    // of dropdown box should be aligned with the right edge of <select> element box,
+    // and the dropdown box should be expanded to left if more space needed.
+    PopupMenuClient* popupClient = m_listBox->m_popupClient;
+    if (popupClient) {
+        bool rightAligned = m_listBox->m_popupClient->menuStyle().textDirection() == RTL;
+        if (rightAligned)
+            move(x() + popupWidth - listBoxWidth, y());
+    }
     invalidate();
 }