diff options
| author | Richard Dale <richard.dale@codethink.co.uk> | 2013-07-04 09:56:52 +0100 |
|---|---|---|
| committer | Richard Dale <richard.dale@codethink.co.uk> | 2013-07-04 09:56:52 +0100 |
| commit | acf9e50d52c4d09a1aed9490bb2f3c5de7dce9bb (patch) | |
| tree | 5b05df5a9e67f397bc7629f0921bc30c64bcc03e /src/controls/ScrollView.qml | |
| parent | a7e874ddf3496766903fc88e52fb61573c3d3f74 (diff) | |
| parent | aa4ddfd8443f07badc0899d835027e46c6e0dfd8 (diff) | |
| download | qtquickcontrols-baserock/morph.tar.gz | |
Merge v5.1.0 releasebaserock/morph
Diffstat (limited to 'src/controls/ScrollView.qml')
| -rw-r--r-- | src/controls/ScrollView.qml | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/controls/ScrollView.qml b/src/controls/ScrollView.qml index 31f69b8f..aa980ddd 100644 --- a/src/controls/ScrollView.qml +++ b/src/controls/ScrollView.qml @@ -86,8 +86,9 @@ import QtQuick.Controls.Styles 1.0 FocusScope { id: root - implicitWidth: 200 - implicitHeight: 100 + + implicitWidth: 240 + implicitHeight: 150 /*! This property tells the ScrollView if it should render @@ -146,8 +147,8 @@ FocusScope { /*! \internal */ property Component style: Qt.createComponent(Settings.style + "/ScrollViewStyle.qml", root) - /* \internal */ - property PaddedStyle __style: styleLoader.item + /*! \internal */ + property Style __style: styleLoader.item activeFocusOnTab: true @@ -236,11 +237,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 |