From f0498a9973f6934cde557b24126f4b1498895bee Mon Sep 17 00:00:00 2001
From: Aaron Seigo <aseigo@kde.org>
Date: Fri, 2 Dec 2011 10:44:54 +0100
Subject: [PATCH] fix spinboxes

BUG:285224
---
 private/style.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/private/style.cpp b/private/style.cpp
index 9fff60d8a..e3449f532 100644
--- a/private/style.cpp
+++ b/private/style.cpp
@@ -61,7 +61,7 @@ public:
         if (!textBox) {
             textBox = new Plasma::FrameSvg(q);
             textBox->setImagePath("widgets/lineedit");
-            textBox->setElementPrefix("sunken");
+            textBox->setElementPrefix("base");
         }
     }
 
@@ -197,7 +197,6 @@ void Style::drawComplexControl(ComplexControl control,
     case CC_SpinBox: {
         d->createTextBox();
 
-        d->textBox->setElementPrefix("base");
         d->textBox->resizeFrame(option->rect.size());
         d->textBox->paintFrame(painter);
 
@@ -252,7 +251,6 @@ void Style::drawComplexControl(ComplexControl control,
             qApp->style()->drawComplexControl(control, option, painter, widget);
         } else {
             d->createTextBox();
-            d->textBox->setElementPrefix("base");
             d->textBox->resizeFrame(option->rect.size());
             d->textBox->paintFrame(painter);
 
@@ -283,7 +281,6 @@ void Style::drawPrimitive(PrimitiveElement element, const QStyleOption *option,
         }
         d->createTextBox();
 
-        d->textBox->setElementPrefix("base");
         d->textBox->resizeFrame(option->rect.size());
         d->textBox->paintFrame(painter);
         break;
@@ -350,7 +347,6 @@ QRect Style::subElementRect(SubElement element, const QStyleOption *option, cons
     switch (element) {
     case SE_LineEditContents: {
         d->createTextBox();
-        d->textBox->setElementPrefix("base");
 
         qreal left, top, right, bottom;
         d->textBox->getMargins(left, top, right, bottom);
@@ -365,9 +361,15 @@ QSize Style::sizeFromContents(ContentsType type, const QStyleOption *option,
                               const QSize &contentsSize, const QWidget *widget) const
 {
     switch (type) {
+    case CT_SpinBox: {
+        d->createTextBox();
+
+        qreal left, top, right, bottom;
+        d->textBox->getMargins(left, top, right, bottom);
+        return contentsSize + QSize(left + right - 2, top + bottom - 2);
+    }
     case CT_LineEdit: {
         d->createTextBox();
-        d->textBox->setElementPrefix("base");
 
         qreal left, top, right, bottom;
         d->textBox->getMargins(left, top, right, bottom);
@@ -376,7 +378,6 @@ QSize Style::sizeFromContents(ContentsType type, const QStyleOption *option,
     default:
         return qApp->style()->sizeFromContents(type, option, contentsSize, widget);
     }
-    
 }
 
 }