diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-27 20:23:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-27 22:10:06 +0200 |
| commit | abe319c9cb811832bb4c9c95290564dfa7b3603a (patch) | |
| tree | e93b7e554b3cd497b86f0be3bd46450a91ea088e /src/controls/Private/ScrollViewHelper.qml | |
| parent | efdd81ce80b018b7b5779876e94f1b722af7fb9a (diff) | |
| parent | 69b3136bae16897492d27558c5909cd61a5e598e (diff) | |
| download | qtquickcontrols-abe319c9cb811832bb4c9c95290564dfa7b3603a.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
tests/auto/qquicktreemodeladaptor/tst_qquicktreemodeladaptor.cpp
Change-Id: I0b6018fdac65a5385136e4c3561fba1c52ecd32e
Diffstat (limited to 'src/controls/Private/ScrollViewHelper.qml')
| -rw-r--r-- | src/controls/Private/ScrollViewHelper.qml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/controls/Private/ScrollViewHelper.qml b/src/controls/Private/ScrollViewHelper.qml index 066bc6cd..810de91d 100644 --- a/src/controls/Private/ScrollViewHelper.qml +++ b/src/controls/Private/ScrollViewHelper.qml @@ -134,6 +134,11 @@ Item { anchors.right: cornerFill.left anchors.leftMargin: leftMargin anchors.bottomMargin: bottomMargin + onScrollAmountChanged: { + if (flickableItem && (flickableItem.atXBeginning || flickableItem.atXEnd)) { + value = flickableItem.contentX - flickableItem.originX + } + } onValueChanged: { if (!blockUpdates) { flickableItem.contentX = value + flickableItem.originX @@ -183,6 +188,11 @@ Item { anchors.top: parent.top anchors.topMargin: __scrollBarTopMargin + topMargin anchors.rightMargin: rightMargin + onScrollAmountChanged: { + if (flickableItem && (flickableItem.atYBeginning || flickableItem.atYEnd)) { + value = flickableItem.contentY - flickableItem.originY + } + } onValueChanged: { if (flickableItem && !blockUpdates && enabled) { flickableItem.contentY = value + flickableItem.originY |