Merge lp:~mzanetti/unity8/spread-fixes into lp:unity8

[Michael Zanetti]

Fixes in the spread after design review

- add a minimum width for the tile info to prevent it going to ...
- tiles should not be interactive any more when moving to spread
- add some resistance to the drag when an app is not closeable
- allow rotating when there is no app focused
- add a fade in animation to the icons in the spread
- fix spread looking out of place when there's only one item

 * 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?
yip yip
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
nope
 * If you changed the UI, has there been a design review?
yip yip

[Lukáš Tinkl (lukas-kde)]

Nice, looks good

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

Yes

* Did CI run pass? If not, please explain why.

Not yet, dunno why, will wait with top approval

review: Approve

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2680
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2471/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3258
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1865
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1865
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/1865
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3286
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3140
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3140/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3140
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3140/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3140
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3140/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3140
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3140/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3140
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3140/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3140
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3140/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3140
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3140/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3140
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3140/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3140
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3140/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2471/rebuild

review: Needs Fixing (continuous-integration)

[Lukáš Tinkl (lukas-kde)]

CI is fine, unrelated failures, passes locally just fine

review: Approve

[Lukáš Tinkl (lukas-kde)]

Yup, still looking good; if design wants to get these fixes in, I'm fine with it

review: Approve

[Lukáš Tinkl (lukas-kde)]

Still good after merge

review: Approve

[lp:~mzanetti/unity8/spread-fixes]

2686. By Michael Zanetti on 2016-11-09

merge prereq

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2016-10-03 11:15:27 +0000
+++ qml/Shell.qml	2016-11-09 14:52:38 +0000
@@ -442,9 +442,10 @@
         }
 
         if (!greeter.locked && tutorial.launcherLongSwipeEnabled
-            && ApplicationManager.focusedApplicationId != "unity8-dash") {
+            && (ApplicationManager.focusedApplicationId != "unity8-dash" || stage.spreadShown)) {
             ApplicationManager.requestFocusApplication("unity8-dash")
             launcher.fadeOut();
+            stage.closeSpread();
         }
     }
 

=== modified file 'qml/Stage/Spread/Spread.qml'
--- qml/Stage/Spread/Spread.qml	2016-09-20 12:03:51 +0000
+++ qml/Stage/Spread/Spread.qml	2016-11-09 14:52:38 +0000
@@ -91,7 +91,7 @@
 
     readonly property real visibleItemCount: (spreadWidth / spreadItemWidth) / (1 - itemOverlap)
 
-    readonly property real spreadTotalWidth: totalItemCount * spreadWidth / visibleItemCount
+    readonly property real spreadTotalWidth: Math.max(2,totalItemCount) * spreadWidth / visibleItemCount
 
     readonly property real centeringOffset: Math.max(spreadWidth - spreadTotalWidth ,0) / (2 * spreadWidth)
 

=== modified file 'qml/Stage/Spread/SpreadDelegateInputArea.qml'
--- qml/Stage/Spread/SpreadDelegateInputArea.qml	2016-10-11 21:48:40 +0000
+++ qml/Stage/Spread/SpreadDelegateInputArea.qml	2016-11-09 14:52:38 +0000
@@ -119,7 +119,13 @@
                 }
             }
 
-            d.distance = tp.y - tp.startY - offset
+            if (root.closeable) {
+                d.distance = tp.y - tp.startY - offset
+            } else {
+                var value = tp.y - tp.startY - offset;
+                d.distance = Math.sqrt(Math.abs(value)) * (value < 0 ? -1 : 1) * 3
+            }
+
             d.pushDragEvent(tp);
         }
 

=== modified file 'qml/Stage/Stage.qml'
--- qml/Stage/Stage.qml	2016-11-09 14:52:38 +0000
+++ qml/Stage/Stage.qml	2016-11-09 14:52:38 +0000
@@ -53,18 +53,18 @@
     property real leftEdgeDragProgress: 0
 
     // Used by the tutorial code
-    readonly property bool spreadShown: state == "spread"
     readonly property real rightEdgeDragProgress: rightEdgeDragArea.dragging ? rightEdgeDragArea.progress : 0 // How far left the stage has been dragged
 
     // used by the snap windows (edge maximize) feature
     readonly property alias previewRectangle: fakeRectangle
 
+    readonly property bool spreadShown: state == "spread"
     readonly property var mainApp: priv.focusedAppDelegate ? priv.focusedAppDelegate.application : null
 
     // application windows never rotate independently
     property int mainAppWindowOrientationAngle: shellOrientationAngle
 
-    property bool orientationChangesEnabled: priv.focusedAppDelegate && priv.focusedAppDelegate.orientationChangesEnabled
+    property bool orientationChangesEnabled: !priv.focusedAppDelegate || priv.focusedAppDelegate.orientationChangesEnabled
 
     property int supportedOrientations: {
         if (mainApp) {
@@ -105,9 +105,13 @@
         edgeBarrier.push(amount);
     }
 
+    function closeSpread() {
+        priv.goneToSpread = false;
+    }
+
     onSpreadEnabledChanged: {
-        if (!spreadEnabled && root.state == "spread") {
-            priv.goneToSpread = false;
+        if (!spreadEnabled && spreadShown) {
+            closeSpread();
         }
     }
 
@@ -481,7 +485,7 @@
             }
         },
         Transition {
-            to: "stagedRightEdge"
+            to: "stagedRightEdge,sideStagedRightEdge"
             PropertyAction { target: floatingFlickable; property: "contentX"; value: 0 }
         },
         Transition {
@@ -1078,6 +1082,7 @@
                             showHighlight: spreadItem.highlightedIndex === index
                             darkening: spreadItem.highlightedIndex >= 0
                             anchors.topMargin: dragArea.distance
+                            interactive: false
                         }
                         PropertyChanges {
                             target: appDelegate
@@ -1117,7 +1122,10 @@
                             scaleToPreviewSize: spreadItem.stackHeight
                             scaleToPreviewProgress: stagedRightEdgeMaths.scaleToPreviewProgress
                             shadowOpacity: .3
+                            interactive: false
                         }
+                        // make sure it's visible but transparent so it fades in when we transition to spread
+                        PropertyChanges { target: windowInfoItem; opacity: 0; visible: true }
                     },
                     State {
                         name: "windowedRightEdge"
@@ -1376,6 +1384,7 @@
                         PropertyAction { target: decoratedWindow; property: "scaleToPreviewSize" }
                         UbuntuNumberAnimation { target: appDelegate; properties: "x,y,height"; duration: priv.animationDuration }
                         UbuntuNumberAnimation { target: decoratedWindow; properties: "width,height,itemScale,angle,scaleToPreviewProgress"; duration: priv.animationDuration }
+                        UbuntuNumberAnimation { target: windowInfoItem; properties: "opacity"; duration: priv.animationDuration }
                     },
                     Transition {
                         from: "normal,staged"; to: "stagedWithSideStage"
@@ -1588,7 +1597,7 @@
                     maxWidth: {
                         var nextApp = appRepeater.itemAt(index + 1);
                         if (nextApp) {
-                            return nextApp.x - appDelegate.x - units.gu(1)
+                            return Math.max(iconHeight, nextApp.x - appDelegate.x - units.gu(1))
                         }
                         return appDelegate.width;
                     }