Merge lp:~gerboland/unity8/fix-sidestage into lp:unity8

Proposed by Gerry Boland
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 244
Merged at revision: 257
Proposed branch: lp:~gerboland/unity8/fix-sidestage
Merge into: lp:unity8
Diff against target: 21 lines (+7/-3)
1 file modified
Shell.qml (+7/-3)
To merge this branch: bzr merge lp:~gerboland/unity8/fix-sidestage
Reviewer Review Type Date Requested Status
Albert Astals Cid (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+182212@code.launchpad.net

Commit message

Fix sidestage applications - they were being ignored in the show-application-surface logic

To post a comment you must log in.
Revision history for this message
Gerry Boland (gerboland) wrote :

Whole Stage mechanism missing tests, so I didn't try

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

Works

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Shell.qml'
2--- Shell.qml 2013-08-21 02:13:56 +0000
3+++ Shell.qml 2013-08-26 21:03:28 +0000
4@@ -161,10 +161,14 @@
5 // Whether the underlay is fully covered by opaque UI elements.
6 property bool fullyCovered: panel.indicators.fullyOpened && shell.width <= panel.indicatorsMenuWidth
7
8+ readonly property bool applicationRunning: ((mainStage.applications && mainStage.applications.count > 0)
9+ || (sideStage.applications && sideStage.applications.count > 0))
10+
11 // Whether the user should see the topmost application surface (if there's one at all).
12- property bool applicationSurfaceShouldBeSeen:
13- (mainStage.applications && mainStage.applications.count > 0)
14- && (!stages.fullyHidden && !mainStage.usingScreenshots)
15+ readonly property bool applicationSurfaceShouldBeSeen: applicationRunning && !stages.fullyHidden
16+ && !mainStage.usingScreenshots // but want sideStage animating over app surface
17+
18+
19
20 // NB! Application surfaces are stacked behing the shell one. So they can only be seen by the user
21 // through the translucent parts of the shell surface.

Subscribers

People subscribed via source and target branches