diff options
author | Jan Arve Saether <jan-arve.saether@theqtcompany.com> | 2014-11-21 12:56:51 +0100 |
---|---|---|
committer | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2014-11-24 12:59:43 +0100 |
commit | 23c6bb1b65357df1010d9801abffd03cd7747938 (patch) | |
tree | 4f8cc7431fe8d795be1c9373d3c79c5077b094b1 /src | |
parent | 5cb56a1adae19e608787cb39b6d90e0a09258871 (diff) | |
download | qtquickcontrols-23c6bb1b65357df1010d9801abffd03cd7747938.tar.gz |
Only make scrollbars non-interactive on mobile devices.
Before this patch, I could not adjust the scrollbars in a ScrollArea on
a Windows 8.1 desktop computer just because it had a touch screen.
The same problem was observed on Linux (with touch screen).
Task-number: QTBUG-42806
Change-Id: I6f35c40b0362820d7c1685e1b6fc8474432237eb
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/controls/Private/ScrollBar.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controls/Private/ScrollBar.qml b/src/controls/Private/ScrollBar.qml index 82750412..3bd0a164 100644 --- a/src/controls/Private/ScrollBar.qml +++ b/src/controls/Private/ScrollBar.qml @@ -102,7 +102,7 @@ Item { onExited: if (!pressed) __panel.activeControl = "none" onMouseXChanged: if (!pressed) __panel.activeControl = __panel.hitTest(mouseX, mouseY) hoverEnabled: !Settings.hasTouchScreen - enabled: !Settings.hasTouchScreen // TODO: touch on desktop? + enabled: !Settings.isMobile || !Settings.hasTouchScreen // ### Not ideal, but will usually behave as expected... preventStealing: true property var pressedX property var pressedY |