diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-09-07 01:32:37 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-09-07 01:32:37 (GMT) |
| commit | 16cdd82a88a63ea050ab2cf70368e023fe50c5bd (patch) | |
| tree | 78daadbbfa00540dc5c271d847a001900400dc05 /demos/declarative | |
| parent | ba6778b080086ef1bb44059b4e871ad46405ce0e (diff) | |
| parent | 60d4d9c0dcc62e579a96d3909e4c04fd9e8fd1d4 (diff) | |
| download | Qt-16cdd82a88a63ea050ab2cf70368e023fe50c5bd.zip Qt-16cdd82a88a63ea050ab2cf70368e023fe50c5bd.tar.gz Qt-16cdd82a88a63ea050ab2cf70368e023fe50c5bd.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'demos/declarative')
| -rw-r--r-- | demos/declarative/flickr/common/ScrollBar.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/demos/declarative/flickr/common/ScrollBar.qml b/demos/declarative/flickr/common/ScrollBar.qml index 89d51e2..d31c57c 100644 --- a/demos/declarative/flickr/common/ScrollBar.qml +++ b/demos/declarative/flickr/common/ScrollBar.qml @@ -12,9 +12,9 @@ Item { border.color: "white" border.width: 2 x: 0 - y: flickableArea.pageYPosition * Container.height + y: flickableArea.visibleArea.yPosition * Container.height width: parent.width - height: flickableArea.pageHeight * Container.height + height: flickableArea.visibleArea.heightRatio * Container.height } states: [ State { |