git.iko.soy/unity8
on xenial help sign in
test fixes
4cbd70fMichael Zanetti
qml/Shell.qml+1−1
compare with xenial
unifiedsplit
@@ -190,12 +190,12 @@ StyledItem {
190 }
190 }
191
191
192 function startApp(appId) {
192 function startApp(appId) {
193− stage.closeSpread();
194 if (!ApplicationManager.findApplication(appId)) {
193 if (!ApplicationManager.findApplication(appId)) {
195 ApplicationManager.startApplication(appId);
194 ApplicationManager.startApplication(appId);
196 }
195 }
197 print("focusing", appId)
196 print("focusing", appId)
198 ApplicationManager.requestFocusApplication(appId);
197 ApplicationManager.requestFocusApplication(appId);
198+ stage.closeSpread();
199 }
199 }
200
200
201 function startLockedApp(app) {
201 function startLockedApp(app) {
qml/Stage/Stage.qml+1
@@ -140,6 +140,7 @@ FocusScope {
140 function updateFocusedAppOrientationAnimated() { /* TODO */}
140 function updateFocusedAppOrientationAnimated() { /* TODO */}
141
141
142 function closeSpread() {
142 function closeSpread() {
143+ spreadItem.highlightedIndex = -1;
143 priv.goneToSpread = false;
144 priv.goneToSpread = false;
144 }
145 }
145
146
tests/qmltests/tst_Shell.qml+1
@@ -1722,6 +1722,7 @@ Rectangle {
1722 wait(0); // spin the loop so bindings get evaluated
1722 wait(0); // spin the loop so bindings get evaluated
1723 }
1723 }
1724 tryCompare(closeMouseArea, "enabled", true)
1724 tryCompare(closeMouseArea, "enabled", true)
1725+ waitForRendering(shell)
1725
1726
1726 var countBeforeClickingCloseButton = topLevelSurfaceList.count;
1727 var countBeforeClickingCloseButton = topLevelSurfaceList.count;
1727 verify(topLevelSurfaceList.indexForId(surfaceId) === 2);
1728 verify(topLevelSurfaceList.indexForId(surfaceId) === 2);