@@ -87,21 +87,29 @@ Rectangle {
8787
8888 function test_containOnFocus() {
8989 waitForRendering(preview);
90− var widget = findChild(preview, "widget-13");
91−
92− widget.forceActiveFocus();
90+ tryCompareFunction(function () { return findChild(preview, "widget-9") != null }, true);
91+ var widget = findChild(preview, "widget-9");
9392
9493 var bottomLeft = preview.mapFromItem(widget, 0, widget.height);
94+ verify(bottomLeft.y > preview.height);
9595
96− tryCompareFunction(function () { return bottomLeft.y <= preview.height }, true);
96+ widget.forceActiveFocus();
97+
98+ tryCompareFunction(function () {
99+ var bottomLeft = preview.mapFromItem(widget, 0, widget.height);
100+ return bottomLeft.y <= preview.height
101+ }, true);
97102 }
98103
99104 function test_containOnGrow() {
100105 waitForRendering(preview);
106+ tryCompareFunction(function () { return findChild(preview, "widget-13") != null }, true);
101107 var widget = findChild(preview, "widget-13");
102108
103− widget.forceActiveFocus();
104− widget.height += 200;
109+ var bottomLeft = preview.mapFromItem(widget, 0, widget.height);
110+ verify(bottomLeft.y > preview.height);
111+
112+ root.height += units.gu(50);
105113
106114 tryCompareFunction(function () {
107115 var bottomLeft = preview.mapFromItem(widget, 0, widget.height);