diff options
author | Liang Qi <liang.qi@qt.io> | 2016-10-19 07:58:53 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-10-19 09:01:43 +0200 |
commit | 124dd9adb5882048e44dcd012e08899d4e480196 (patch) | |
tree | f6022e22f08f2128df2b0cc2081c2b8843408aba /src/quicktemplates2/qquickscrollbar.cpp | |
parent | 6cb2367f01c1f78d760c1a4d70002cf5a5046396 (diff) | |
parent | d6fbb1239950f392f3d569da7dde226e865b7bcd (diff) |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml
src/imports/controls/material/qquickmaterialstyle.cpp
Change-Id: I00b533e28407f87a31588e92109a468a5bfb4cc8
Diffstat (limited to 'src/quicktemplates2/qquickscrollbar.cpp')
-rw-r--r-- | src/quicktemplates2/qquickscrollbar.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickscrollbar.cpp b/src/quicktemplates2/qquickscrollbar.cpp index ead17cb8..ebccbcba 100644 --- a/src/quicktemplates2/qquickscrollbar.cpp +++ b/src/quicktemplates2/qquickscrollbar.cpp @@ -334,9 +334,10 @@ void QQuickScrollBar::increase() { Q_D(QQuickScrollBar); qreal step = qFuzzyIsNull(d->stepSize) ? 0.1 : d->stepSize; + bool wasActive = d->active; setActive(true); setPosition(d->position + step); - setActive(false); + setActive(wasActive); } /*! @@ -350,9 +351,10 @@ void QQuickScrollBar::decrease() { Q_D(QQuickScrollBar); qreal step = qFuzzyIsNull(d->stepSize) ? 0.1 : d->stepSize; + bool wasActive = d->active; setActive(true); setPosition(d->position - step); - setActive(false); + setActive(wasActive); } void QQuickScrollBar::mousePressEvent(QMouseEvent *event) |