Unity 8

Merge lp:~mzanetti/unity8/fix-occlusion-detection into lp:unity8

fix-occlusion-detection
Merge into trunk

Proposed by Michael Zanetti on 2015-11-25

Status:	Merged
Approved by:	Nick Dedekind on 2015-12-03
Approved revision:	2059
Merged at revision:	2094
Proposed branch:	lp:~mzanetti/unity8/fix-occlusion-detection
Merge into:	lp:unity8
Diff against target:	109 lines (+51/-7) 3 files modified qml/Stages/DesktopStage.qml (+10/-7) tests/qmltests/Stages/tst_DesktopStage.qml (+40/-0) tests/qmltests/tst_Shell.qml (+1/-0)
To merge this branch:	bzr merge lp:~mzanetti/unity8/fix-occlusion-detection
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-12-03
Nick Dedekind (community)		2015-12-01	Approve on 2015-12-03
Daniel d'Andrada (community)		2015-11-25	Abstain on 2015-12-01
Review via email: mp+278637@code.launchpad.net

Commit Message

Use proper z ordering instead of app index for occlusion detection

Description of the Change

* Are there any related MPs required for this MP to build/function as expected? Please list.

nope

* Did you perform an exploratory manual test run of your code change and any related functionality?

* Did you make sure that your branch does not contain spurious tags?

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

n/a

* If you changed the UI, has there been a design review?

n/a

PS Jenkins bot (ps-jenkins) wrote on 2015-11-30:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6842/rebuild

review: Needs Fixing (continuous-integration)

Daniel d'Andrada (dandrader) on 2015-12-01:

review: Abstain

Michael Zanetti (mzanetti) wrote on 2015-12-03:

hmm... can't repro that test failure here... re-triggered jenkins to see if it's flakiness.

Nick Dedekind (nick-dedekind) wrote on 2015-12-03:

me neither. All is ok here.
Code looks fine & tests pass.

review: Approve

PS Jenkins bot (ps-jenkins) wrote on 2015-12-03:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6875/rebuild

review: Needs Fixing (continuous-integration)

lp:~mzanetti/unity8/fix-occlusion-detection updated on 2015-12-03

2060. By Michael Zanetti on 2015-12-03: stabilize test (not really related to that branch but lets keep Jenkins happy)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Michael Zanetti

Mohammad Rakibul Hasan

Unity Team

 === modified file 'qml/Stages/DesktopStage.qml'
 --- qml/Stages/DesktopStage.qml	2015-11-26 13:34:05 +0000
 +++ qml/Stages/DesktopStage.qml	2015-12-03 15:31:00 +0000
@@ -123,17 +123,17 @@
+         }
          onFocusedAppDelegateChanged: updateForegroundMaximizedApp();
--        property int foregroundMaximizedAppIdIndex: -1
++        property int foregroundMaximizedAppZ: -1
          function updateForegroundMaximizedApp() {
--            for (var i = 0; i < appRepeater.count; i++) {
++            var tmp = -1;
++            for (var i = appRepeater.count - 1; i >= 0; i--) {
                  var item = appRepeater.itemAt(i);
                  if (item && item.visuallyMaximized) {
--                    foregroundMaximizedAppIdIndex = i;
--                    return;
++                    tmp = Math.max(tmp, item.normalZ);
+                 }
+             }
--            foregroundMaximizedAppIdIndex = -1;
++            foregroundMaximizedAppZ = tmp;
+         }
          function indexOf(appId) {
@@ -237,7 +237,10 @@
              delegate: FocusScope {
                  id: appDelegate
                  objectName: "appDelegate_" + appId
--                z: ApplicationManager.count - index
++                // z might be overriden in some cases by effects, but we need z ordering
++                // to calculate occlusion detection
++                property int normalZ: ApplicationManager.count - index
++                z: normalZ
                  y: PanelState.panelHeight
                  focus: appId === priv.focusedAppId
                  width: decoratedWindow.width
@@ -274,7 +277,7 @@
                  visible: !visuallyMinimized &&
                           !greeter.fullyShown &&
--                         (priv.foregroundMaximizedAppIdIndex === -1 || priv.foregroundMaximizedAppIdIndex >= index) ||
++                         (priv.foregroundMaximizedAppZ === -1 || priv.foregroundMaximizedAppZ <= z) ||
                           (spread.state == "altTab" && index === spread.highlightedIndex)
                  Binding {
 === modified file 'tests/qmltests/Stages/tst_DesktopStage.qml'
 --- tests/qmltests/Stages/tst_DesktopStage.qml	2015-11-24 17:44:18 +0000
 +++ tests/qmltests/Stages/tst_DesktopStage.qml	2015-12-03 15:31:00 +0000
@@ -458,5 +458,45 @@
              compare(dialerDelegate.visible, true, "Dialer should be visible");
              compare(dashDelegate.visible, true, "Dash should still be visible");
+         }
++
++        function test_occlusionWithMultipleMaximized() {
++            var dashApp = startApplication("unity8-dash");
++            var dashAppDelegate = findChild(desktopStage, "appDelegate_unity8-dash");
++
++            var dialerApp = startApplication("dialer-app");
++            var dialerAppDelegate = findChild(desktopStage, "appDelegate_dialer-app");
++
++            var facebookApp = startApplication("facebook-webapp");
++            var facebookAppDelegate = findChild(desktopStage, "appDelegate_facebook-webapp");
++
++            // all of them are in restored state now. all should be visible
++            tryCompare(dashAppDelegate, "visible", true);
++            tryCompare(dialerAppDelegate, "visible", true);
++            tryCompare(facebookAppDelegate, "visible", true);
++
++            // Maximize the topmost and make sure the other two are hidden
++            facebookAppDelegate.maximize();
++            tryCompare(dashAppDelegate, "visible", false);
++            tryCompare(dialerAppDelegate, "visible", false);
++            tryCompare(facebookAppDelegate, "visible", true);
++
++            // Bring dash to front. make sure dash and the maximized facebook are visible, the restored one behind is hidden
++            ApplicationManager.focusApplication("unity8-dash");
++            tryCompare(dashAppDelegate, "visible", true);
++            tryCompare(dialerAppDelegate, "visible", false);
++            tryCompare(facebookAppDelegate, "visible", true);
++
++            // Now focus the dialer app. all 3 should be visible again
++            ApplicationManager.focusApplication("dialer-app");
++            tryCompare(dashAppDelegate, "visible", true);
++            tryCompare(dialerAppDelegate, "visible", true);
++            tryCompare(facebookAppDelegate, "visible", true);
++
++            // Maximize the dialer app. The other 2 should hide
++            dialerAppDelegate.maximize();
++            tryCompare(dashAppDelegate, "visible", false);
++            tryCompare(dialerAppDelegate, "visible", true);
++            tryCompare(facebookAppDelegate, "visible", false);
++        }
+     }
+ }
 === modified file 'tests/qmltests/tst_Shell.qml'
 --- tests/qmltests/tst_Shell.qml	2015-11-24 17:44:18 +0000
 +++ tests/qmltests/tst_Shell.qml	2015-12-03 15:31:00 +0000
@@ -1730,6 +1730,7 @@
              tryCompare(desktopSpread, "state", "altTab")
              revealLauncherByEdgePushWithMouse();
++            tryCompare(launcher, "x", 0);
              waitForRendering(shell)
              mouseClick(bfb, bfb.width / 2, bfb.height / 2)