diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2012-12-10 14:31:50 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-11 18:34:19 +0100 |
| commit | a31dd2e995c91a5e3e429ad76afc90c0a2af3dcf (patch) | |
| tree | 6f0625e335643b81877cb2422a8249be4139c22a /src/widgets | |
| parent | cf728e60a71629096188f5d680047414dbb4956b (diff) | |
QScrollBar::initStyleOption(): fix QStyle::State_On handling
QWindowsStyle considers QStyle::State_On as pressed, whereas
QMacStyle uses the same state for transient scrollbars. Thus,
to indicate transient scrollbars, QScrollBar::initStyleOption()
must set QStyle::State_On only when the current style actually
supports transient scrollbars.
Task-number: QTBUG-28523
Change-Id: I94d207b1e8c5c4bd6f4b99e8b4f1661197fbe9dd
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/widgets/qscrollbar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/widgets/qscrollbar.cpp b/src/widgets/widgets/qscrollbar.cpp index be3d2db670..d59d7cdd55 100644 --- a/src/widgets/widgets/qscrollbar.cpp +++ b/src/widgets/widgets/qscrollbar.cpp @@ -325,7 +325,7 @@ void QScrollBar::initStyleOption(QStyleOptionSlider *option) const option->upsideDown = d->invertedAppearance; if (d->orientation == Qt::Horizontal) option->state |= QStyle::State_Horizontal; - if (d->flashed || !d->transient) + if ((d->flashed || !d->transient) && style()->styleHint(QStyle::SH_ScrollBar_Transient)) option->state |= QStyle::State_On; } |