1f9c3ed · unity8 · git.iko.soy

on xenial help sign in

fix 2 failing tests

1f9c3edLukáš Tinkl10 years ago

qml/Stages/DesktopStage.qml+3

@@ -375,6 +375,9 @@ AbstractStage {

375 }

376

377 onFocusChanged: {

378+ if (appRepeater.startingUp)

379+ return;

380+

378 if (focus) {

381 if (focus) {

379 // If we're orphan (!parent) it means this stage is no longer the current one

382 // If we're orphan (!parent) it means this stage is no longer the current one

380 // and will be deleted shortly. So we should no longer have a say over the model

383 // and will be deleted shortly. So we should no longer have a say over the model

tests/qmltests/tst_Shell.qml+2−4

@@ -2508,10 +2508,8 @@ Rectangle {

2508 appDelegate.maximize();

2509 tryCompare(appDelegate, "state", "maximized");

2510

2511− mousePress(panel);

2511+ mouseDrag(panel, panel.width/2, panel.height/2, 0, shell.height/3, Qt.LeftButton);

2512− mouseMove(shell, shell.width/2, shell.height/2);

2512+ mouseRelease(appDelegate.findChild("appWindowDecoration"));

2513− mouseRelease(shell);

2514−

2515 tryCompare(appDelegate, "state", "restored");

2513 tryCompare(appDelegate, "state", "restored");

2516 }

2514 }

2517

2515