diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-11-24 14:56:12 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-11-24 15:10:22 +0000 |
| commit | 4d2021e7d600959c8a30e4d8b57278791301831b (patch) | |
| tree | f1c0be004e85f27c875298706ab7c4ce2ed8c1e5 /tests | |
| parent | 9c038a71c383a7fb01a9ef4bc847b34807cec31f (diff) | |
Fix ScrollBar layouting
QQuickScrollBar was relying on itemGeometryChanged() for the attached
flickable. If the flickable geometry didn't change _after_ scroll bar
was attached, the bar was not positioned and resized as appropriate.
Change-Id: I8f8695b468596acf570e028dae96f7c31d73ffba
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/controls/data/tst_scrollbar.qml | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/tests/auto/controls/data/tst_scrollbar.qml b/tests/auto/controls/data/tst_scrollbar.qml index 5baa0ba9..55f31e12 100644 --- a/tests/auto/controls/data/tst_scrollbar.qml +++ b/tests/auto/controls/data/tst_scrollbar.qml @@ -93,12 +93,20 @@ TestCase { compare(vertical.position, 0.0) compare(vertical.active, false) compare(vertical.orientation, Qt.Vertical) + compare(vertical.x, 0) + compare(vertical.y, 0) + verify(vertical.width > 0) + verify(vertical.height > 0) container.ScrollBar.vertical = vertical compare(vertical.parent, container) compare(vertical.orientation, Qt.Vertical) compare(vertical.size, container.visibleArea.heightRatio) compare(vertical.position, container.visibleArea.yPosition) + compare(vertical.x, container.width - vertical.width) + compare(vertical.y, 0) + verify(vertical.width > 0) + compare(vertical.height, container.height) var horizontal = scrollBar.createObject() verify(!horizontal.parent) @@ -106,12 +114,20 @@ TestCase { compare(horizontal.position, 0.0) compare(horizontal.active, false) compare(horizontal.orientation, Qt.Vertical) + compare(horizontal.x, 0) + compare(horizontal.y, 0) + verify(horizontal.width > 0) + verify(horizontal.height > 0) container.ScrollBar.horizontal = horizontal compare(horizontal.parent, container) compare(horizontal.orientation, Qt.Horizontal) compare(horizontal.size, container.visibleArea.widthRatio) compare(horizontal.position, container.visibleArea.xPosition) + compare(horizontal.x, 0) + compare(horizontal.y, container.height - horizontal.height) + compare(horizontal.width, container.width) + verify(horizontal.height > 0) var velocity = container.maximumFlickVelocity |