Merge lp:~aacid/unity8/new-scopes-show-dash-app-running into lp:~unity-team/unity8/new-scopes

[Albert Astals Cid]

Show the Dash when only a sidestage app is running

[lp:~aacid/unity8/new-scopes-show-dash-app-running]

659. By Albert Astals Cid on 2014-02-20

logs-=3

660. By Albert Astals Cid on 2014-02-20

Saviq suggested darkening instead of half scaling/opacity

Works well too

661. By Albert Astals Cid on 2014-02-20

Enable the sidestage handle to close the sidestage even if there's no main stage app

662. By Albert Astals Cid on 2014-02-20

Merge

663. By Albert Astals Cid on 2014-02-21

Merge

664. By Albert Astals Cid on 2014-02-21

hide/show improvements for sidestage+dash

665. By Albert Astals Cid on 2014-02-21

Merge

666. By Albert Astals Cid on 2014-02-21

Better

667. By Albert Astals Cid on 2014-02-21

don't show hud button when on dash+hidden sidestage app scenario

=== modified file 'qml/Components/Showable.qml'
--- qml/Components/Showable.qml	2013-10-01 18:18:52 +0000
+++ qml/Components/Showable.qml	2014-02-21 13:57:05 +0000
@@ -107,6 +107,9 @@
             if (!hideAnimation.running) {
                 hideAnimation.restart()
             }
+            if (__skipShowAnimation) {
+                hideAnimation.complete();
+            }
         } else {
             visible = false
             required = false
@@ -115,6 +118,11 @@
         shown = false
     }
 
+    function hideNow() {
+        __skipShowAnimation = true;
+        hide();
+    }
+
     Connections {
         target: hideAnimation ? hideAnimation: null
         onRunningChanged: {

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2014-02-20 20:38:07 +0000
+++ qml/Shell.qml	2014-02-21 13:57:05 +0000
@@ -83,8 +83,6 @@
         applicationManager.setSideStageAppRect(sideStageAppRect);
     }
 
-    readonly property bool applicationFocused: !!applicationManager.mainStageFocusedApplication
-                                               || !!applicationManager.sideStageFocusedApplication
     // Used for autopilot testing.
     readonly property string currentFocusedAppId: ApplicationManager.focusedApplicationId
 
@@ -149,66 +147,94 @@
         // Whether the underlay is fully covered by opaque UI elements.
         property bool fullyCovered: panel.indicators.fullyOpened && shell.width <= panel.indicatorsMenuWidth
 
-        readonly property bool applicationRunning: ((mainStage.applications && mainStage.applications.count > 0)
-                                           || (sideStage.applications && sideStage.applications.count > 0))
+        readonly property bool mainStageApplicationRunning: mainStage.applications && mainStage.applications.count > 0
+        readonly property bool sideStageApplicationRunning: sideStage.applications && sideStage.applications.count > 0
 
         // Whether the user should see the topmost application surface (if there's one at all).
-        readonly property bool applicationSurfaceShouldBeSeen: applicationRunning && !stages.fullyHidden
+        readonly property bool mainStageApplicationShown: mainStageApplicationRunning && !stages.fullyHidden
                                            && !mainStage.usingScreenshots // but want sideStage animating over app surface
 
 
 
         // NB! Application surfaces are stacked behing the shell one. So they can only be seen by the user
         // through the translucent parts of the shell surface.
-        visible: !fullyCovered && !applicationSurfaceShouldBeSeen
-
-        Rectangle {
-            anchors.fill: parent
-            color: "black"
-            opacity: dash.disappearingAnimationProgress
-        }
-
-        Image {
-            anchors.fill: dash
-            source: shell.width > shell.height ? "Dash/graphics/paper_landscape.png" : "Dash/graphics/paper_portrait.png"
-            fillMode: Image.PreserveAspectCrop
-            horizontalAlignment: Image.AlignRight
-            verticalAlignment: Image.AlignTop
-        }
-
-        Dash {
-            id: dash
-            objectName: "dash"
-
-            available: !greeter.shown && !lockscreen.shown
-            hides: [stages, launcher, panel.indicators]
-            shown: disappearingAnimationProgress !== 1.0
-            enabled: disappearingAnimationProgress === 0.0 && edgeDemo.dashEnabled
-            // FIXME: unfocus all applications when going back to the dash
-            onEnabledChanged: {
-                if (enabled) {
-                    shell.applicationManager.unfocusCurrentApplication()
-                }
-            }
-
-            anchors {
-                fill: parent
-                topMargin: panel.panelHeight
-            }
-
-            contentScale: 1.0 - 0.2 * disappearingAnimationProgress
-            opacity: 1.0 - disappearingAnimationProgress
-            property real disappearingAnimationProgress: {
-                if (greeter.shown) {
-                    return greeter.showProgress;
+        visible: !fullyCovered && !mainStageApplicationShown
+
+        Item {
+            id: underlayClipper
+            clip: !parent.mainStageApplicationShown && parent.sideStageApplicationRunning && stagesOuterContainer.showProgress > 0
+            width: {
+                if (clip) {
+                    var w = parent.width - sideStage.width
+                    w += stagesOuterContainer.x + stages.x + (sideStage.x - sideStageRevealer.openedValue)
+                    return Math.min(w, parent.width);
                 } else {
-                    return stagesOuterContainer.showProgress;
-                }
-            }
-
-            // FIXME: only necessary because stagesOuterContainer.showProgress and
-            // greeterRevealer.animatedProgress are not animated
-            Behavior on disappearingAnimationProgress { SmoothedAnimation { velocity: 5 }}
+                    return parent.width;
+                }
+            }
+            height: parent.height
+
+            Image {
+                anchors.fill: dash
+                source: shell.width > shell.height ? "Dash/graphics/paper_landscape.png" : "Dash/graphics/paper_portrait.png"
+                fillMode: Image.PreserveAspectCrop
+                horizontalAlignment: Image.AlignRight
+                verticalAlignment: Image.AlignTop
+            }
+
+            Dash {
+                id: dash
+                objectName: "dash"
+
+                available: !greeter.shown && !lockscreen.shown
+                hides: [stages, launcher, panel.indicators]
+                shown: disappearingAnimationProgress !== 1.0
+                enabled: disappearingAnimationProgress === 0.0 && edgeDemo.dashEnabled
+                // FIXME: unfocus all applications when going back to the dash
+                onEnabledChanged: {
+                    if (enabled) {
+                        shell.applicationManager.unfocusCurrentApplication()
+                    }
+                }
+
+                width: underlay.width
+                height: underlay.height - y
+                y: panel.panelHeight
+
+                contentScale: 1.0 - 0.2 * disappearingAnimationProgress
+                opacity: 1.0 - disappearingAnimationProgress
+                property real disappearingAnimationProgress: {
+                    if (greeter.shown) {
+                        return greeter.showProgress;
+                    } else {
+                        if (underlayClipper.clip)
+                            return 0;
+                        else
+                            return stagesOuterContainer.showProgress;
+                    }
+                }
+
+                // FIXME: only necessary because stagesOuterContainer.showProgress and
+                // greeterRevealer.animatedProgress are not animated
+                Behavior on disappearingAnimationProgress { SmoothedAnimation { velocity: 5 }}
+            }
+
+            Rectangle {
+                width: underlay.width
+                height: underlay.height
+                color: "black"
+                opacity: 0.5 * ((sideStage.x - sideStageRevealer.closedValue) / (sideStageRevealer.openedValue - sideStageRevealer.closedValue))
+                visible: sideStageHideButton.enabled
+            }
+
+            AbstractButton {
+                id: sideStageHideButton
+                enabled: mainStage.applications.count == 0 && sideStage.shown
+                anchors.fill: parent
+                onClicked: {
+                    sideStage.hide();
+                }
+            }
         }
     }
 
@@ -217,7 +243,7 @@
 
         width: parent.width
         height: parent.height
-        x: launcher.progress
+        x: mainStage.applications.count > 0 ? launcher.progress : 0
         Behavior on x {SmoothedAnimation{velocity: 600}}
 
         property real showProgress:
@@ -229,6 +255,16 @@
 
             x: width
 
+            function doLauncherHide() {
+                if (mainStage.applications.count > 0) {
+                    hide();
+                } else {
+                    if (sideStage.shown) {
+                        sideStage.hide();
+                    }
+                }
+            }
+
             property bool fullyShown: shown && x == 0 && parent.x == 0
             property bool fullyHidden: !shown && x == width
             available: !greeter.shown
@@ -313,11 +349,6 @@
                 rightEdgeDraggingAreaWidth: shell.edgeSize
                 normalApplicationY: shell.panelHeight
 
-                onShownChanged: {
-                    if (!shown && mainStage.applications.count == 0) {
-                        stages.hide();
-                    }
-                }
                 // FIXME: when hiding the side stage, refocus the main stage
                 // application so that it goes in front of the side stage
                 // application and hides it
@@ -346,8 +377,16 @@
                 Connections {
                     target: sideStage.applications
                     onCountChanged: {
-                        if (sideStage.applications.count == 0 && sideStage.shown) { // if all SS app closed, hide side stage
-                            sideStage.hide();
+                        if (sideStage.applications.count == 0) {
+                            if (sideStage.shown) { // if all SS app closed, hide side stage
+                                sideStage.hide();
+                            } else {
+                                // Sidestage is hidden and there is no main app, make sure the
+                                // stages is totally hidden too
+                                if (mainStage.applications.count == 0) {
+                                    stages.hideNow();
+                                }
+                            }
                         }
                     }
                 }
@@ -356,7 +395,7 @@
             Revealer {
                 id: sideStageRevealer
 
-                enabled: mainStage.applications.count > 0 && sideStage.applications.count > 0
+                enabled: sideStage.applications.count > 0
                          && sideStage.available
                 direction: Qt.RightToLeft
                 openedValue: parent.width - sideStage.width
@@ -561,8 +600,14 @@
     }
 
     InputFilterArea {
-        anchors.fill: parent
-        blockInput: !applicationFocused || greeter.shown || lockscreen.shown || launcher.shown
+        width: {
+            if (applicationManager.sideStageFocusedApplication && sideStage.shown)
+                return parent.width - sideStage.width;
+            else
+                return parent.width;
+        }
+        height: parent.height
+        blockInput: !applicationManager.mainStageFocusedApplication || greeter.shown || lockscreen.shown || launcher.shown
                     || panel.indicators.shown || hud.shown
     }
 
@@ -664,7 +709,7 @@
             theHud: hud
             anchors.fill: parent
             enabled: hud.available
-            applicationIsOnForeground: applicationFocused
+            applicationIsOnForeground: (stages.shown && mainStage.applications.count > 0) || (stages.shown && sideStage.shown)
         }
 
         InputFilterArea {
@@ -696,7 +741,7 @@
             }
             onDash: {
                 if (stages.shown) {
-                    stages.hide();
+                    stages.doLauncherHide();
                     launcher.hide();
                 }
             }