diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2009-09-03 05:49:22 (GMT) |
---|---|---|
committer | Alan Alpert <alan.alpert@nokia.com> | 2009-09-03 05:49:22 (GMT) |
commit | cece4361fc7048272c251ba19bb78fe236fc01c1 (patch) | |
tree | fb07440f97e717a5c3753c5d0e305d92907fe902 /examples/declarative | |
parent | 3732fb8ac1ef79b47a4e8df9c37154618a1adc5e (diff) | |
parent | 17ffae16bd1ea4e4c37b2ef3d0dc0de2d5a517a1 (diff) | |
download | Qt-cece4361fc7048272c251ba19bb78fe236fc01c1.zip Qt-cece4361fc7048272c251ba19bb78fe236fc01c1.tar.gz Qt-cece4361fc7048272c251ba19bb78fe236fc01c1.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'examples/declarative')
-rw-r--r-- | examples/declarative/scrollbar/ScrollBar.qml | 4 | ||||
-rw-r--r-- | examples/declarative/scrollbar/display.qml | 10 |
2 files changed, 6 insertions, 8 deletions
diff --git a/examples/declarative/scrollbar/ScrollBar.qml b/examples/declarative/scrollbar/ScrollBar.qml index c1c4a4f..b42563d 100644 --- a/examples/declarative/scrollbar/ScrollBar.qml +++ b/examples/declarative/scrollbar/ScrollBar.qml @@ -7,8 +7,8 @@ Item { // height of the page, i.e. a pageSize of 0.5 means that you can see 50% // of the height of the view. // orientation can be either 'Vertical' or 'Horizontal' - property var position - property var pageSize + property real position + property real pageSize property var orientation : "Vertical" // A light, semi-transparent background diff --git a/examples/declarative/scrollbar/display.qml b/examples/declarative/scrollbar/display.qml index 48cceb7..0180bda 100644 --- a/examples/declarative/scrollbar/display.qml +++ b/examples/declarative/scrollbar/display.qml @@ -38,22 +38,20 @@ Rectangle { id: SBV opacity: 0 orientation: "Vertical" - position: View.pageYPosition - pageSize: View.pageHeight + position: View.visibleArea.yPosition + pageSize: View.visibleArea.heightRatio width: 12 height: View.height-12 anchors.right: View.right } - /* ScrollBar { id: SBH opacity: 0 orientation: "Horizontal" - position: View.pageXPosition - pageSize: View.pageWidth + position: View.visibleArea.xPosition + pageSize: View.visibleArea.widthRatio height: 12 width: View.width-12 anchors.bottom: View.bottom } - */ } |