@@ -287,12 +287,16 @@ Rectangle {
287 removeTimeConstraintsFromSwipeAreas(root);
287 removeTimeConstraintsFromSwipeAreas(root);
290− function dragLauncherIntoView() {
290+ function dragLauncher() {
291 var startX = launcher.dragAreaWidth/2;
291 var startX = launcher.dragAreaWidth/2;
292 var startY = launcher.height/2;
292 var startY = launcher.height/2;
293 touchFlick(launcher,
293 touchFlick(launcher,
294 startX, startY,
294 startX, startY,
295 startX+units.gu(8), startY);
295 startX+units.gu(8), startY);
298+ function dragLauncherIntoView() {
297 var panel = findChild(launcher, "launcherPanel");
301 var panel = findChild(launcher, "launcherPanel");
298 verify(!!panel);
302 verify(!!panel);
@@ -1340,6 +1344,8 @@ Rectangle {
1342 function test_preventMouseEventsThru() {
1346 function test_preventMouseEventsThru() {
1343 dragLauncherIntoView();
1349 dragLauncherIntoView();
1344 var launcherPanel = findChild(launcher, "launcherPanel");
1350 var launcherPanel = findChild(launcher, "launcherPanel");
1345 tryCompare(launcherPanel, "visible", true);
1351 tryCompare(launcherPanel, "visible", true);
@@ -1353,5 +1359,22 @@ Rectangle {
1353 mouseWheel(launcherPanel, launcherPanel.width/2, launcherPanel.height/2, Qt.RightButton);
1359 mouseWheel(launcherPanel, launcherPanel.width/2, launcherPanel.height/2, Qt.RightButton);
1354 tryCompare(clickThroughSpy, "count", 0);
1360 tryCompare(clickThroughSpy, "count", 0);
1363+ function test_launcherEnabledSetting() {
1364+ launcher.available = true;
1366+ dragLauncherIntoView();
1367+ var launcherPanel = findChild(launcher, "launcherPanel");
1368+ compare(launcherPanel.x, 0);
1371+ function test_launcherDisabledSetting() {
1372+ launcher.available = false;
1374+ //We don't actually care that it's visible, so juct use dragLauncher() rather than dragLauncherIntoView()
1376+ var launcherPanel = findChild(launcher, "launcherPanel");
1377+ compare(launcherPanel.x, -launcherPanel.width);