diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2013-05-27 15:07:33 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-27 16:54:57 +0200 |
| commit | a84444f3809e9372c61ace8f5b973ad59fcaa9af (patch) | |
| tree | b44f4c3664a0f2ac9bd0974d0bd313215587c663 /src/controls/ScrollView.qml | |
| parent | dbf42fc0028acc0170bb0d0dad966c74b86a456e (diff) | |
| download | qtquickcontrols-a84444f3809e9372c61ace8f5b973ad59fcaa9af.tar.gz | |
ScrollView: take Flickable::originX and originY into account
Change-Id: I16eb186a2b1f706bbc961d34a614bf2f9a9a0646
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'src/controls/ScrollView.qml')
| -rw-r--r-- | src/controls/ScrollView.qml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/controls/ScrollView.qml b/src/controls/ScrollView.qml index 31f69b8f..3262648e 100644 --- a/src/controls/ScrollView.qml +++ b/src/controls/ScrollView.qml @@ -236,11 +236,15 @@ FocusScope { property bool horizontalRecursionGuard: false property bool verticalRecursionGuard: false - horizontalMaximumValue: flickableItem ? flickableItem.contentWidth - viewport.width : 0 - verticalMaximumValue: flickableItem ? flickableItem.contentHeight - viewport.height + __viewTopMargin : 0 + horizontalMinimumValue: flickableItem ? flickableItem.originX : 0 + horizontalMaximumValue: flickableItem ? flickableItem.originX + flickableItem.contentWidth - viewport.width : 0 + + verticalMinimumValue: flickableItem ? flickableItem.originY : 0 + verticalMaximumValue: flickableItem ? flickableItem.originY + flickableItem.contentHeight - viewport.height + __viewTopMargin : 0 Connections { target: flickableItem + onContentYChanged: { wheelArea.verticalRecursionGuard = true wheelArea.verticalValue = flickableItem.contentY |