diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-15 11:05:54 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-15 11:05:54 +0100 |
| commit | d601a02c236314a023d5cea53d17747df6a9d84b (patch) | |
| tree | a60986e35d1e5cd4874b4c7c014c07c5a05baa5b /src/controls/Styles/Base/ScrollViewStyle.qml | |
| parent | 46425199ebcdd4cb9facb471f67e17a941ca103f (diff) | |
| parent | c231395eec3494619f4977b4c5cd845b9d7341ae (diff) | |
| download | qtquickcontrols-d601a02c236314a023d5cea53d17747df6a9d84b.tar.gz | |
Merge remote-tracking branch 'origin/5.12.2' into 5.12
Change-Id: I8816a9d3e27cf79950b94fefd3bce86923c125c5
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 6750399d..36b518d3 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 : 1)) * bg.width : - Math.min(1, (flickableItem ? flickableItem.height/flickableItem.contentHeight : 1)) * bg.height) + Math.min(1, ((flickableItem && flickableItem.contentWidth > 0.0) ? flickableItem.width/flickableItem.contentWidth : 1)) * bg.width : + Math.min(1, ((flickableItem && flickableItem.contentHeight > 0.0) ? flickableItem.height/flickableItem.contentHeight : 1)) * bg.height) readonly property real range: __control.maximumValue - __control.minimumValue readonly property real begin: __control.value - __control.minimumValue |