diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-09-07 03:07:16 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-09-07 03:07:16 (GMT) |
| commit | 6ead3fa2b5b88844fb85137a7e11708084e63cbf (patch) | |
| tree | 9e556bea011064b8f001fb4c1468b3cdf7d803e3 /demos/declarative | |
| parent | bb6fb2bb9e329024f617369dc3ae9dde2963287b (diff) | |
| parent | 16cdd82a88a63ea050ab2cf70368e023fe50c5bd (diff) | |
| download | Qt-6ead3fa2b5b88844fb85137a7e11708084e63cbf.zip Qt-6ead3fa2b5b88844fb85137a7e11708084e63cbf.tar.gz Qt-6ead3fa2b5b88844fb85137a7e11708084e63cbf.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 { |