on xenial help sign in
review
7d9e347Nick Dedekind
qml/Stages/DesktopStage.qml+1−1
@@ -164,7 +164,7 @@ AbstractStage {
164
164
165 visible: !visuallyMinimized &&
165 visible: !visuallyMinimized &&
166 (priv.foregroundMaximizedAppIdIndex === -1 || priv.foregroundMaximizedAppIdIndex >= index) ||
166 (priv.foregroundMaximizedAppIdIndex === -1 || priv.foregroundMaximizedAppIdIndex >= index) ||
167− (spread.focus && index === spread.highlightedIndex)
167+ (spread.state == "altTab" && index === spread.highlightedIndex)
168
168
169 Binding {
169 Binding {
170 target: ApplicationManager.get(index)
170 target: ApplicationManager.get(index)
tests/qmltests/Stages/tst_DesktopStage.qml+11−9
@@ -215,7 +215,7 @@ Item {
215 tryCompare(ApplicationManager.findApplication(data.apps[data.focusTo]).session.surface, "activeFocus", true);
215 tryCompare(ApplicationManager.findApplication(data.apps[data.focusTo]).session.surface, "activeFocus", true);
216 }
216 }
217
217
218− function test_minimizeApplicationHidesSurface(data) {
218+ function test_minimizeApplicationHidesSurface() {
219 var dashApp = startApplication("unity8-dash");
219 var dashApp = startApplication("unity8-dash");
220
220
221 var dashDelegate = findChild(desktopStage, "stageDelegate_unity8-dash");
221 var dashDelegate = findChild(desktopStage, "stageDelegate_unity8-dash");
@@ -225,7 +225,7 @@ Item {
225 tryCompare(dashApp.session.surface, "visible", false);
225 tryCompare(dashApp.session.surface, "visible", false);
226 }
226 }
227
227
228− function test_maximizeApplicationHidesSurfacesBehindIt(data) {
228+ function test_maximizeApplicationHidesSurfacesBehindIt() {
229 var dashApp = startApplication("unity8-dash");
229 var dashApp = startApplication("unity8-dash");
230 var dialerApp = startApplication("dialer-app");
230 var dialerApp = startApplication("dialer-app");
231 var cameraApp = startApplication("camera-app");
231 var cameraApp = startApplication("camera-app");
@@ -248,23 +248,25 @@ Item {
248 compare(cameraApp.session.surface.visible, true);
248 compare(cameraApp.session.surface.visible, true);
249 }
249 }
250
250
251− function test_applicationsBecomeVisibleWhenOccludingAppRemoved(data) {
251+ function test_applicationsBecomeVisibleWhenOccludingAppRemoved() {
252 var dashApp = startApplication("unity8-dash");
252 var dashApp = startApplication("unity8-dash");
253− var dialerApp = startApplication("dialer-app");
254− var cameraApp = startApplication("camera-app");
255− var galleryApp = startApplication("gallery-app");
256−
257 var dashDelegate = findChild(desktopStage, "stageDelegate_unity8-dash");
253 var dashDelegate = findChild(desktopStage, "stageDelegate_unity8-dash");
258 verify(dashDelegate);
254 verify(dashDelegate);
255+
256+ var dialerApp = startApplication("dialer-app");
259 var dialerDelegate = findChild(desktopStage, "stageDelegate_dialer-app");
257 var dialerDelegate = findChild(desktopStage, "stageDelegate_dialer-app");
260 verify(dialerDelegate);
258 verify(dialerDelegate);
259+
260+ var cameraApp = startApplication("camera-app");
261 var cameraDelegate = findChild(desktopStage, "stageDelegate_camera-app");
261 var cameraDelegate = findChild(desktopStage, "stageDelegate_camera-app");
262 verify(cameraDelegate);
262 verify(cameraDelegate);
263+ dialerDelegate.maximize();
264+
265+ var galleryApp = startApplication("gallery-app");
263 var galleryDelegate = findChild(desktopStage, "stageDelegate_gallery-app");
266 var galleryDelegate = findChild(desktopStage, "stageDelegate_gallery-app");
264 verify(galleryDelegate);
267 verify(galleryDelegate);
265−
266− dialerDelegate.maximize();
267 galleryDelegate.maximize();
268 galleryDelegate.maximize();
269+
268 tryCompare(dialerDelegate, "visuallyMaximized", true);
270 tryCompare(dialerDelegate, "visuallyMaximized", true);
269 tryCompare(galleryDelegate, "visuallyMaximized", true);
271 tryCompare(galleryDelegate, "visuallyMaximized", true);
270
272