on xenial help sign in
review
commit7d9e34797bd154a49d8834e39b122e6cd3e4544c authorNick Dedekind <nick.dedekind@canonical.com> dateThu 29 Oct 2015, 14:31 (11 years ago) parenta71b8e7
2 files changed+12−10
qml/Stages/DesktopStage.qml+1−1 tests/qmltests/Stages/tst_DesktopStage.qml+11−9
qml/Stages/DesktopStage.qml+1−1
@@ -164,7 +164,7 @@ AbstractStage {
164164
165165 visible: !visuallyMinimized &&
166166 (priv.foregroundMaximizedAppIdIndex === -1 || priv.foregroundMaximizedAppIdIndex >= index) ||
167− (spread.focus && index === spread.highlightedIndex)
167+ (spread.state == "altTab" && index === spread.highlightedIndex)
168168
169169 Binding {
170170 target: ApplicationManager.get(index)
tests/qmltests/Stages/tst_DesktopStage.qml+11−9
@@ -215,7 +215,7 @@ Item {
215215 tryCompare(ApplicationManager.findApplication(data.apps[data.focusTo]).session.surface, "activeFocus", true);
216216 }
217217
218− function test_minimizeApplicationHidesSurface(data) {
218+ function test_minimizeApplicationHidesSurface() {
219219 var dashApp = startApplication("unity8-dash");
220220
221221 var dashDelegate = findChild(desktopStage, "stageDelegate_unity8-dash");
@@ -225,7 +225,7 @@ Item {
225225 tryCompare(dashApp.session.surface, "visible", false);
226226 }
227227
228− function test_maximizeApplicationHidesSurfacesBehindIt(data) {
228+ function test_maximizeApplicationHidesSurfacesBehindIt() {
229229 var dashApp = startApplication("unity8-dash");
230230 var dialerApp = startApplication("dialer-app");
231231 var cameraApp = startApplication("camera-app");
@@ -248,23 +248,25 @@ Item {
248248 compare(cameraApp.session.surface.visible, true);
249249 }
250250
251− function test_applicationsBecomeVisibleWhenOccludingAppRemoved(data) {
251+ function test_applicationsBecomeVisibleWhenOccludingAppRemoved() {
252252 var dashApp = startApplication("unity8-dash");
253− var dialerApp = startApplication("dialer-app");
254− var cameraApp = startApplication("camera-app");
255− var galleryApp = startApplication("gallery-app");
256−
257253 var dashDelegate = findChild(desktopStage, "stageDelegate_unity8-dash");
258254 verify(dashDelegate);
255+
256+ var dialerApp = startApplication("dialer-app");
259257 var dialerDelegate = findChild(desktopStage, "stageDelegate_dialer-app");
260258 verify(dialerDelegate);
259+
260+ var cameraApp = startApplication("camera-app");
261261 var cameraDelegate = findChild(desktopStage, "stageDelegate_camera-app");
262262 verify(cameraDelegate);
263+ dialerDelegate.maximize();
264+
265+ var galleryApp = startApplication("gallery-app");
263266 var galleryDelegate = findChild(desktopStage, "stageDelegate_gallery-app");
264267 verify(galleryDelegate);
265−
266− dialerDelegate.maximize();
267268 galleryDelegate.maximize();
269+
268270 tryCompare(dialerDelegate, "visuallyMaximized", true);
269271 tryCompare(galleryDelegate, "visuallyMaximized", true);
270272