Changeset 53591 in webkit

Timestamp:

Jan 20, 2010, 6:31:21 PM (16 years ago)

Author:

dbates@webkit.org

Message:

2010-01-20 Daniel Bates <​dbates@webkit.org>

Reviewed by Tor Arne Vestbø.

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

[Qt] Fixes an issue where the height of <button>- and
<input type="button">- elements are fixed to the height of the
button label font plus padding. That is, the CSS height property
is being ignored.

Instead, we should honor the user-specified height, if appropriate
for the platform and context. Notice, the Mac ports do not honor the
height for <input type="button"> elements unless a border and/or
background is also specified.

Test: fast/css/button-height.html

• platform/qt/RenderThemeQt.cpp: (WebCore::RenderThemeQt::RenderThemeQt): (WebCore::RenderThemeQt::adjustButtonStyle):

2010-01-20 Daniel Bates <​dbates@webkit.org>

Reviewed by Tor Arne Vestbø.

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

Tests that the user-specified height for <button>- and <input type="button">-
elements are honored, if appropriate for the platform and context.

• fast/css/button-height-expected.txt: Added.
• fast/css/button-height.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/button-height-expected.txt (added)
• LayoutTests/fast/css/button-height.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/qt/RenderThemeQt.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-01-20  Daniel Bates  <dbates@webkit.org>
+
+        Reviewed by Tor Arne Vestbø.
+
+        https://bugs.webkit.org/show_bug.cgi?id=29564
+        
+        Tests that the user-specified height for <button>- and <input type="button">-
+        elements are honored, if appropriate for the platform and context.
+
+        * fast/css/button-height-expected.txt: Added.
+        * fast/css/button-height.html: Added.
+
 2010-01-20  Brady Eidson  <beidson@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-20  Daniel Bates  <dbates@webkit.org>
+
+        Reviewed by Tor Arne Vestbø.
+
+        https://bugs.webkit.org/show_bug.cgi?id=29564
+
+        [Qt] Fixes an issue where the height of <button>- and
+        <input type="button">- elements are fixed to the height of the
+        button label font plus padding. That is, the CSS height property
+        is being ignored.
+
+        Instead, we should honor the user-specified height, if appropriate
+        for the platform and context. Notice, the Mac ports do not honor the
+        height for <input type="button"> elements unless a border and/or
+        background is also specified.
+
+        Test: fast/css/button-height.html
+
+        * platform/qt/RenderThemeQt.cpp:
+        (WebCore::RenderThemeQt::RenderThemeQt):
+        (WebCore::RenderThemeQt::adjustButtonStyle):
+
 2010-01-20  Brady Eidson  <beidson@apple.com>
 

trunk/WebCore/platform/qt/RenderThemeQt.cpp

@@ -398 +398 @@
     style->resetBorder();
 
-    // Height is locked to auto.
-    style->setHeight(Length(Auto));
+#ifdef Q_WS_MAC
+    if (style->appearance() == PushButtonPart) {
+        // The Mac ports ignore the specified height for <input type="button"> elements
+        // unless a border and/or background CSS property is also specified.
+        style->setHeight(Length(Auto));
+    }
+#endif
 
     // White-space is locked to pre