diff options
| author | Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> | 2011-07-05 12:06:43 (GMT) |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> | 2011-07-05 12:08:37 (GMT) |
| commit | 9ef422955154199e6f2d5569cb4074a5967f53e9 (patch) | |
| tree | 19ddb5ce28c2156ddf2f27826f6b54f55d9c4610 | |
| parent | 56d49960bb99b7a4c18fc106fcca4effaeea8782 (diff) | |
| download | Qt-9ef422955154199e6f2d5569cb4074a5967f53e9.zip Qt-9ef422955154199e6f2d5569cb4074a5967f53e9.tar.gz Qt-9ef422955154199e6f2d5569cb4074a5967f53e9.tar.bz2 | |
Lion Support: Fix QSpinBox look
Also sets the read-only state in QStyleOptionSpinBox, wich wasn't before.
Reviewed-by: Jens Bache-Wiig
| -rw-r--r-- | src/gui/styles/qmacstyle_mac.mm | 2 | ||||
| -rw-r--r-- | src/gui/widgets/qabstractspinbox.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm index efe2e7d..321db25 100644 --- a/src/gui/styles/qmacstyle_mac.mm +++ b/src/gui/styles/qmacstyle_mac.mm @@ -4725,7 +4725,7 @@ void QMacStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComplex HIThemeFrameDrawInfo fdi; fdi.version = qt_mac_hitheme_version; - fdi.state = tds; + fdi.state = ((sb->state & State_ReadOnly) || !(sb->state & State_Enabled)) ? kThemeStateInactive : kThemeStateActive; fdi.kind = kHIThemeFrameTextFieldSquare; fdi.isFocused = false; HIRect hirect = qt_hirectForQRect(lineeditRect); diff --git a/src/gui/widgets/qabstractspinbox.cpp b/src/gui/widgets/qabstractspinbox.cpp index 4372ae3..7a985a1 100644 --- a/src/gui/widgets/qabstractspinbox.cpp +++ b/src/gui/widgets/qabstractspinbox.cpp @@ -1655,6 +1655,8 @@ void QAbstractSpinBox::initStyleOption(QStyleOptionSpinBox *option) const : (QAbstractSpinBox::StepDownEnabled|QAbstractSpinBox::StepUpEnabled); option->frame = d->frame; + if (d->readOnly) + option->state |= QStyle::State_ReadOnly; } /*! |