alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix spinboxes

Browse Source 
BUG:285224
This commit is contained in:
Aaron Seigo 2011-12-02 10:44:54 +01:00
parent dd15c33c2b
commit f0498a9973
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
private/style.cpp
View File

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