on xenial help sign in
Fix sidestage applications - they were being ignored in the show-application-surface logic. Fixes: https://bugs.launchpad.net/bugs/1210079, https://bugs.launchpad.net/bugs/1217027.
db537b1Gerry Boland
Shell.qml+7−3
@@ -161,10 +161,14 @@ FocusScope {
161 // Whether the underlay is fully covered by opaque UI elements.
161 // Whether the underlay is fully covered by opaque UI elements.
162 property bool fullyCovered: panel.indicators.fullyOpened && shell.width <= panel.indicatorsMenuWidth
162 property bool fullyCovered: panel.indicators.fullyOpened && shell.width <= panel.indicatorsMenuWidth
163
163
164+ readonly property bool applicationRunning: ((mainStage.applications && mainStage.applications.count > 0)
165+ || (sideStage.applications && sideStage.applications.count > 0))
166+
164 // Whether the user should see the topmost application surface (if there's one at all).
167 // Whether the user should see the topmost application surface (if there's one at all).
165− property bool applicationSurfaceShouldBeSeen:
168+ readonly property bool applicationSurfaceShouldBeSeen: applicationRunning && !stages.fullyHidden
166− (mainStage.applications && mainStage.applications.count > 0)
167− && (!stages.fullyHidden && !mainStage.usingScreenshots)
169+ && !mainStage.usingScreenshots // but want sideStage animating over app surface
170+
171+
168
172
169 // NB! Application surfaces are stacked behing the shell one. So they can only be seen by the user
173 // NB! Application surfaces are stacked behing the shell one. So they can only be seen by the user
170 // through the translucent parts of the shell surface.
174 // through the translucent parts of the shell surface.