diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-04 12:52:17 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-04 12:52:17 (GMT) |
| commit | c85d2aa7e8d095221e1cc2b4aac2dcd4e9dee775 (patch) | |
| tree | 2a34c484e132021950ac68ce25bb551131ae8dbe | |
| parent | ca6ed3ab4ebdb4d8f365294a61662edd8da22d34 (diff) | |
| parent | 62db1b73220b77e1e424e76cae35aaddf2a0709d (diff) | |
| download | Qt-c85d2aa7e8d095221e1cc2b4aac2dcd4e9dee775.zip Qt-c85d2aa7e8d095221e1cc2b4aac2dcd4e9dee775.tar.gz Qt-c85d2aa7e8d095221e1cc2b4aac2dcd4e9dee775.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
When one of the spin button subcontrol is activated, the state member of
| -rw-r--r-- | src/qt3support/widgets/q3spinwidget.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/qt3support/widgets/q3spinwidget.cpp b/src/qt3support/widgets/q3spinwidget.cpp index 3dc36c5..3bfad06 100644 --- a/src/qt3support/widgets/q3spinwidget.cpp +++ b/src/qt3support/widgets/q3spinwidget.cpp @@ -340,11 +340,13 @@ void Q3SpinWidget::paintEvent(QPaintEvent *) QPainter p(this); QStyleOptionSpinBox opt = getStyleOption(this); - if (d->theButton & 1) + if (d->theButton & 1) { opt.activeSubControls = QStyle::SC_SpinBoxDown; - else if (d->theButton & 2) + opt.state |= QStyle::State_Sunken; + } else if (d->theButton & 2) { opt.activeSubControls = QStyle::SC_SpinBoxUp; - else + opt.state |= QStyle::State_Sunken; + } else opt.activeSubControls = QStyle::SC_None; opt.rect = style()->subControlRect(QStyle::CC_SpinBox, &opt, QStyle::SC_SpinBoxFrame, this); opt.subControls = QStyle::SC_All; |