From 9c038a71c383a7fb01a9ef4bc847b34807cec31f Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 24 Nov 2015 14:42:09 +0100 Subject: Fix ScrollIndicator layouting QQuickScrollIndicator was relying on itemGeometryChanged() for the attached flickable. If the flickable geometry didn't change _after_ scroll indicator was attached, the indicator was not positioned and resized as appropriate. Change-Id: Ib5b4816b4ba96ad73873722045ac4e3b7e47038d Reviewed-by: Mitch Curtis --- tests/auto/controls/data/tst_scrollindicator.qml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'tests/auto/controls/data/tst_scrollindicator.qml') diff --git a/tests/auto/controls/data/tst_scrollindicator.qml b/tests/auto/controls/data/tst_scrollindicator.qml index 71e09784..99eef833 100644 --- a/tests/auto/controls/data/tst_scrollindicator.qml +++ b/tests/auto/controls/data/tst_scrollindicator.qml @@ -78,12 +78,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.ScrollIndicator.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 = scrollIndicator.createObject() verify(!horizontal.parent) @@ -91,12 +99,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.ScrollIndicator.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 -- cgit v1.2.3