2011-04-15 Andreas Kling <kling@webkit.org>

Andreas Kling · Andreas Kling · commit d7fbe1246b38 · 2011-04-15T20:11:31.000Z
Rolling out accidental part of r84010. * platform/qt/RenderThemeQt.cpp: (WebCore::RenderThemeQt::computeSizeBasedOnStyle): (WebCore::RenderThemeQt::setButtonPadding): 2011-04-15 Andreas Kling <kling@webkit.org> Rolling out accidental part of r84010. * fast/forms/button-line-break.html: Removed. Canonical link: https://commits.webkit.org/73767@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@84025 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-15  Andreas Kling  <kling@webkit.org>
+
+        Rolling out accidental part of r84010.
+
+        * fast/forms/button-line-break.html: Removed.
+
 2011-04-15  Andreas Kling  <kling@webkit.org>
 
         Reviewed by Antonio Gomes.
diff --git a/LayoutTests/fast/forms/button-line-break.html b/LayoutTests/fast/forms/button-line-break.html
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2011-04-15  Andreas Kling  <kling@webkit.org>
+
+        Rolling out accidental part of r84010.
+
+        * platform/qt/RenderThemeQt.cpp:
+        (WebCore::RenderThemeQt::computeSizeBasedOnStyle):
+        (WebCore::RenderThemeQt::setButtonPadding):
+
 2011-04-15  Oliver Hunt  <oliver@apple.com>
 
         Forgot windows build fix.
diff --git a/Source/WebCore/platform/qt/RenderThemeQt.cpp b/Source/WebCore/platform/qt/RenderThemeQt.cpp
@@ -527,9 +527,9 @@ void RenderThemeQt::computeSizeBasedOnStyle(RenderStyle* renderStyle) const
 
     // FIXME: Check is flawed, since it doesn't take min-width/max-width into account.
     if (renderStyle->width().isIntrinsicOrAuto() && size.width() > 0)
-        renderStyle->setMinWidth(Length(size.width(), Fixed));
+        renderStyle->setWidth(Length(size.width(), Fixed));
     if (renderStyle->height().isAuto() && size.height() > 0)
-        renderStyle->setMinHeight(Length(size.height(), Fixed));
+        renderStyle->setHeight(Length(size.height(), Fixed));
 }
 
 void RenderThemeQt::setCheckboxSize(RenderStyle* style) const
@@ -607,8 +607,8 @@ void RenderThemeQt::setButtonPadding(RenderStyle* style) const
     int buttonMargin = qStyle()->pixelMetric(QStyle::PM_ButtonMargin, &styleOption, 0);
     int paddingLeft = buttonMargin;
     int paddingRight = buttonMargin;
-    int paddingTop = buttonMargin;
-    int paddingBottom = buttonMargin;
+    int paddingTop = 1;
+    int paddingBottom = 0;
 
     // Then check if the style uses layout margins
     QRect layoutRect = qStyle()->subElementRect(QStyle::SE_PushButtonLayoutItem,
