diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-04-30 07:14:17 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-04-30 07:14:17 (GMT) |
| commit | feea3a74f77aace876716e114fdb91a3557b9478 (patch) | |
| tree | 2fb72cb7592a38a4c027ffb695f458f3d6720636 | |
| parent | 6b7b289ef47c4e8300a1f5a9ba86044b890a1014 (diff) | |
| parent | 969b9f644187f2a04ec6c3a09e6446538823026b (diff) | |
| download | Qt-feea3a74f77aace876716e114fdb91a3557b9478.zip Qt-feea3a74f77aace876716e114fdb91a3557b9478.tar.gz Qt-feea3a74f77aace876716e114fdb91a3557b9478.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
| -rw-r--r-- | src/gui/styles/qs60style.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index 20eaf16..a232c28 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -741,6 +741,9 @@ void QS60Style::drawComplexControl(ComplexControl control, const QStyleOptionCom { const QS60StylePrivate::SkinElementFlags flags = (option->state & State_Enabled) ? QS60StylePrivate::SF_StateEnabled : QS60StylePrivate::SF_StateDisabled; SubControls sub = option->subControls; + + Q_D(const QS60Style); + switch (control) { #ifndef QT_NO_SCROLLBAR case CC_ScrollBar: @@ -2203,12 +2206,12 @@ QRect QS60Style::subControlRect(ComplexControl control, const QStyleOptionComple QS60StylePrivate::pixelMetric(QStyle::PM_ButtonIconSize) + 2*buttonMargin; //todo: buttonMargin commented out as WAY too big in pixel metrics QSize buttonSize; - buttonSize.setHeight(qMax(8, spinbox->rect.height()/2 - frameThickness)); + buttonSize.setHeight(qMax(8, spinbox->rect.height() - frameThickness)); buttonSize.setWidth(buttonWidth); buttonSize = buttonSize.expandedTo(QApplication::globalStrut()); const int y = frameThickness + spinbox->rect.y(); - const int x = spinbox->rect.x() + spinbox->rect.width() - frameThickness - buttonSize.width(); + const int x = spinbox->rect.x() + spinbox->rect.width() - frameThickness - 2*buttonSize.width(); switch (scontrol) { case SC_SpinBoxUp: @@ -2219,7 +2222,7 @@ QRect QS60Style::subControlRect(ComplexControl control, const QStyleOptionComple case SC_SpinBoxDown: if (spinbox->buttonSymbols == QAbstractSpinBox::NoButtons) return QRect(); - ret = QRect(x, y + buttonSize.height(), buttonWidth, buttonSize.height()); + ret = QRect(x+buttonSize.width(), y, buttonWidth, buttonSize.height()); break; case SC_SpinBoxEditField: if (spinbox->buttonSymbols == QAbstractSpinBox::NoButtons) |