summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@digia.com>2013-08-05 13:51:13 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-08-10 11:39:53 +0200
commit865b43dbf3f220cce61d245b7042e777e834952c (patch)
treefe8d22e53626501744782d71e12d2b672a2a38aa /src
parent73251f22f337c27ffaf0353fed7985cbaeae0bdb (diff)
QScrollBar: handle QWheelEvent::Phase for transient scrollbars
Transient scrollbars should become and stay visible when touching the pad with two fingers. Change-Id: Ic36ba56019f484cedb2404550551ebe68ea6f285 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/widgets/widgets/qscrollbar.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/widgets/widgets/qscrollbar.cpp b/src/widgets/widgets/qscrollbar.cpp
index e1e2723a2d..4ed91204cd 100644
--- a/src/widgets/widgets/qscrollbar.cpp
+++ b/src/widgets/widgets/qscrollbar.cpp
@@ -510,6 +510,11 @@ void QScrollBar::wheelEvent(QWheelEvent *event)
Q_D(QScrollBar);
if (d->scrollByDelta(event->orientation(), event->modifiers(), delta))
event->accept();
+
+ if (event->phase() == QWheelEvent::Started)
+ d->setTransient(false);
+ else if (event->phase() == QWheelEvent::Ended)
+ d->setTransient(true);
}
#endif