git.iko.soy/unity8
on xenial help sign in
test fixes
commit4cbd70fe9219b03d5443cb33fdf2cb13063e96a0 authorMichael Zanetti <michael.zanetti@canonical.com> dateWed 5 Apr 2017, 17:04 (10 years ago) parentb6ab28f
3 files changed+3−1
compare with xenial
unifiedsplit
qml/Shell.qml+1−1 qml/Stage/Stage.qml+1 tests/qmltests/tst_Shell.qml+1
qml/Shell.qml+1−1
@@ -190,12 +190,12 @@ StyledItem {
190190 }
191191
192192 function startApp(appId) {
193− stage.closeSpread();
194193 if (!ApplicationManager.findApplication(appId)) {
195194 ApplicationManager.startApplication(appId);
196195 }
197196 print("focusing", appId)
198197 ApplicationManager.requestFocusApplication(appId);
198+ stage.closeSpread();
199199 }
200200
201201 function startLockedApp(app) {
qml/Stage/Stage.qml+1
@@ -140,6 +140,7 @@ FocusScope {
140140 function updateFocusedAppOrientationAnimated() { /* TODO */}
141141
142142 function closeSpread() {
143+ spreadItem.highlightedIndex = -1;
143144 priv.goneToSpread = false;
144145 }
145146
tests/qmltests/tst_Shell.qml+1
@@ -1722,6 +1722,7 @@ Rectangle {
17221722 wait(0); // spin the loop so bindings get evaluated
17231723 }
17241724 tryCompare(closeMouseArea, "enabled", true)
1725+ waitForRendering(shell)
17251726
17261727 var countBeforeClickingCloseButton = topLevelSurfaceList.count;
17271728 verify(topLevelSurfaceList.indexForId(surfaceId) === 2);