Changeset 17995 in webkit

Timestamp:

Dec 4, 2006 1:21:08 AM (17 years ago)

Author:

rwlbuis

Message:

Reviewed by dhyatt.

Patch by pmax.

​http://bugs.webkit.org/show_bug.cgi?id=3280
With LEGEND element, align=right value is not supported
​http://bugs.webkit.org/show_bug.cgi?id=11544
<legend> rendering doesn't take align into account

Allow aligning for legends in both RTL and LTR mode.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/fieldset-align-expected.checksum (added)
• LayoutTests/fast/forms/fieldset-align-expected.png (added)
• LayoutTests/fast/forms/fieldset-align-expected.txt (added)
• LayoutTests/fast/forms/fieldset-align.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderFieldset.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2006-12-04  Rob Buis  <buis@kde.org>
+
+        Reviewed by dhyatt.
+
+        Patch by pmax.
+
+        Testcase for:
+        http://bugs.webkit.org/show_bug.cgi?id=3280
+        With LEGEND element, align=right value is not supported
+        http://bugs.webkit.org/show_bug.cgi?id=11544
+        <legend> rendering doesn't take align into account
+
+        * fast/forms/fieldset-align-expected.checksum: Added.
+        * fast/forms/fieldset-align-expected.png: Added.
+        * fast/forms/fieldset-align-expected.txt: Added.
+        * fast/forms/fieldset-align.html: Added.
+
 2006-12-03  Nikolas Zimmermann  <zimmermann@kde.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-12-04  Rob Buis  <buis@kde.org>
+
+        Reviewed by dhyatt.
+
+        Patch by pmax.
+
+        http://bugs.webkit.org/show_bug.cgi?id=3280
+        With LEGEND element, align=right value is not supported
+        http://bugs.webkit.org/show_bug.cgi?id=11544
+        <legend> rendering doesn't take align into account
+
+        Allow aligning for legends in both RTL and LTR mode.
+
+        * rendering/RenderFieldset.cpp:
+        (WebCore::RenderFieldset::layoutLegend):
+
 2006-12-03  Mark Rowe  <bdash@webkit.org>
 

trunk/WebCore/rendering/RenderFieldset.cpp

@@ -50 +50 @@
         legend->layoutIfNeeded();
 
-        int xPos = borderLeft() + paddingLeft() + legend->marginLeft();
-        if (style()->direction() == RTL)
-            xPos = m_width - paddingRight() - borderRight() - legend->width() - legend->marginRight();
+        int xPos;
+        if (style()->direction() == RTL) {
+            switch (legend->style()->textAlign()) {
+                case LEFT:
+                    xPos = borderLeft() + paddingLeft();
+                    break;
+                case CENTER:
+                    xPos = (m_width - legend->width()) / 2;
+                    break;
+                default:
+                    xPos = m_width - paddingRight() - borderRight() - legend->width() - legend->marginRight();
+            }
+        } else {
+            switch (legend->style()->textAlign()) {
+                case RIGHT:
+                    xPos = m_width - paddingRight() - borderRight() - legend->width();
+                    break;
+                case CENTER:
+                    xPos = (m_width - legend->width()) / 2;
+                    break;
+                default:
+                    xPos = borderLeft() + paddingLeft() + legend->marginLeft();
+            }
+        }
         int b = borderTop();
         int h = legend->height();