diff --git a/src/controls/Private/ScrollBar.qml b/src/controls/Private/ScrollBar.qml index 65ed51cfcee66ce1e29ddf99d2f40900ba917962..1734e4961c7b079e072d33b1fe695ac78479e7b8 100644 --- a/src/controls/Private/ScrollBar.qml +++ b/src/controls/Private/ScrollBar.qml @@ -101,7 +101,8 @@ Item { onEntered: if (!pressed) __panel.activeControl = __panel.hitTest(mouseX, mouseY) onExited: if (!pressed) __panel.activeControl = "none" onMouseXChanged: if (!pressed) __panel.activeControl = __panel.hitTest(mouseX, mouseY) - hoverEnabled: true + hoverEnabled: !Settings.hasTouchScreen + enabled: !Settings.hasTouchScreen // TODO: touch on desktop? property var pressedX property var pressedY diff --git a/src/controls/Styles/Base/ScrollViewStyle.qml b/src/controls/Styles/Base/ScrollViewStyle.qml index a7dbcc520ead322d492260f47eb85099eff3701d..1944ed43d411f18c8faf1c78cdecd3fff1a4d4c7 100644 --- a/src/controls/Styles/Base/ScrollViewStyle.qml +++ b/src/controls/Styles/Base/ScrollViewStyle.qml @@ -117,7 +117,7 @@ Style { implicitHeight: Math.round(TextSingleton.implicitHeight) clip: true opacity: transientScrollBars ? 0.5 : 1.0 - visible: !transientScrollBars || sticky + visible: !Settings.hasTouchScreen && (!transientScrollBars || sticky) Rectangle { anchors.fill: parent color: "#ddd"