summaryrefslogtreecommitdiff
path: root/src/controls/ScrollView.qml
diff options
context:
space:
mode:
authorJens Bache-Wiig <jens.bache-wiig@digia.com>2013-04-25 12:51:51 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-26 13:43:08 +0200
commit4015bdea71ac067d595b1b2ca09355acfab12d56 (patch)
tree84a356a184c1ed3f1b1156012fbfcda5299a4d55 /src/controls/ScrollView.qml
parent5dec3ed5f22b9e2fa08bc67916c775366329fde7 (diff)
downloadqtquickcontrols-4015bdea71ac067d595b1b2ca09355acfab12d56.tar.gz
ScrollBar style refactoring
Making ScrollBar harmonize with other styles by using Style and panel. Change-Id: Ic3bbae6d3a5d456ba3b3668c71ede3b3e11d2dc7 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'src/controls/ScrollView.qml')
-rw-r--r--src/controls/ScrollView.qml4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/ScrollView.qml b/src/controls/ScrollView.qml
index 46692fc1..8dc1bd1b 100644
--- a/src/controls/ScrollView.qml
+++ b/src/controls/ScrollView.qml
@@ -269,8 +269,8 @@ FocusScope {
ScrollViewHelper {
id: scroller
anchors.fill: parent
- property int frameWidth: frameVisible ? __style.defaultFrameWidth : 0
- property bool outerFrame: !frameVisible || !(__style ? __style.frameOnlyAroundContents : 0)
+ property int frameWidth: frameVisible ? __style.frameWidth : 0
+ property bool outerFrame: !frameVisible || !(__style ? __style.externalScrollBars : 0)
property int scrollBarSpacing: outerFrame ? 0 : (__style ? __style.scrollBarSpacing : 0)
property int verticalScrollbarOffset: verticalScrollBar.visible && !verticalScrollBar.isTransient ?
verticalScrollBar.width + scrollBarSpacing : 0