1f9c3ed · unity8 · git.iko.soy

fix 2 failing tests

commit1f9c3ed6e898fccbbe16de95093947fefeb267af authorLukáš Tinkl <lukas.tinkl@canonical.com> dateThu 1 Sep 2016, 17:29 (10 years ago) parent0857fc1

2 files changed+5−4

unifiedsplit

qml/Stages/DesktopStage.qml+3

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

375375 }

376376

377377 onFocusChanged: {

378+ if (appRepeater.startingUp)

379+ return;

380+

378381 if (focus) {

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

380383 // 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 {

25082508 appDelegate.maximize();

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

25102510

2511− mousePress(panel);

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

2513− mouseRelease(shell);

2514−

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

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

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

25162514 }

25172515