diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-12-15 11:21:15 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-12-15 11:21:15 +0100 |
| commit | 3e7b3aae9c736ec62a727f218a73f86886e2a367 (patch) | |
| tree | d06037b68eb1f69619957ab1883ddcdb56790f65 /src/controls/Styles/Base/ScrollViewStyle.qml | |
| parent | b9c95d63efde5d0ee9d332074285d5a4800391b5 (diff) | |
| parent | 15c909f4170450cdbe01218a0d7cbea55b70fae5 (diff) | |
| download | qtquickcontrols-3e7b3aae9c736ec62a727f218a73f86886e2a367.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
Change-Id: If27d9c3cbc17765c4180651189c4b8d19b8409da
Diffstat (limited to 'src/controls/Styles/Base/ScrollViewStyle.qml')
| -rw-r--r-- | src/controls/Styles/Base/ScrollViewStyle.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/Styles/Base/ScrollViewStyle.qml b/src/controls/Styles/Base/ScrollViewStyle.qml index 3df278c6..26285c85 100644 --- a/src/controls/Styles/Base/ScrollViewStyle.qml +++ b/src/controls/Styles/Base/ScrollViewStyle.qml @@ -370,8 +370,8 @@ Style { property var flickableItem: control.flickableItem property int extent: Math.max(minimumHandleLength, __styleData.horizontal ? - Math.min(1, (flickableItem ? flickableItem.width/flickableItem.contentWidth : 0)) * bg.width : - Math.min(1, (flickableItem ? flickableItem.height/flickableItem.contentHeight : 0)) * bg.height) + Math.min(1, (flickableItem ? flickableItem.width/flickableItem.contentWidth : 1)) * bg.width : + Math.min(1, (flickableItem ? flickableItem.height/flickableItem.contentHeight : 1)) * bg.height) readonly property real range: __control.maximumValue - __control.minimumValue readonly property real begin: __control.value - __control.minimumValue |