@@ -113,6 +113,10 @@ Rectangle {
113113 }
114114 Label {
115115 text: "Launcher always visible"
116+ AbstractButton {
117+ anchors.fill: parent
118+ onClicked: lockedVisibleCheckBox.checked = !lockedVisibleCheckBox.checked
119+ }
116120 }
117121 }
118122
@@ -261,9 +265,15 @@ Rectangle {
261265 // iteration to do its work. So to ensure the reload, we will wait until the
262266 // Shell instance gets destroyed.
263267 tryCompare(launcherLoader, "itemDestroyed", true);
268+ }
269+
270+ function initLauncher() {
264271 launcherLoader.active = true;
272+ tryCompare(launcherLoader, "itemDestroyed", false);
265273 }
274+
266275 function init() {
276+ initLauncher();
267277 var panel = findChild(launcher, "launcherPanel");
268278 verify(!!panel);
269279
@@ -279,7 +289,7 @@ Rectangle {
279289 // growing while populating it with icons etc.
280290 tryCompare(listView, "flicking", false);
281291
282− compare(listView.contentY, -listView.topMargin, "Launcher did not start up with first item unfolded");
292+ tryCompare(listView, "contentY", -listView.topMargin, 5000, "Launcher did not start up with first item unfolded");
283293
284294 // Now do check that snapping is in fact enabled
285295 compare(listView.snapMode, ListView.SnapToItem, "Snapping is not enabled");
@@ -538,6 +548,7 @@ Rectangle {
538548 }
539549
540550 function test_clickFlick_data() {
551+ initLauncher()
541552 var listView = findChild(launcher, "launcherListView");
542553 return [
543554 {tag: "unfolded top", positionViewAtBeginning: true,