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

[Michael Zanetti]

Added blur and darkening to wallpaper while in spread

Prereq-archive: ppa:ci-train-ppa-service/2022

* Are there any related MPs required for this MP to build/function as expected? Please list.
see prereq
 * Did you perform an exploratory manual test run of your code change and any related functionality?
yes
 * 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?
yes, visual changes given by Vesa

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

FAILED: Continuous integration, rev:2671
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2438/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/3196/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3224
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3080/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3080/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3080/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3080/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3080/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3080/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3080/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3080/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3080/console

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

review: Needs Fixing (continuous-integration)

[Lukáš Tinkl (lukas-kde)]

Yeah code looks good, tested it and works fine

Will top approve after a meaningful CI run

review: Approve

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

FAILED: Continuous integration, rev:2671
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2439/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/3197/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3225
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3081/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3081/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3081/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3081/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3081/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3081/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3081/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3081/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3081/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:2671
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2440/
Executed test runs:
    ABORTED: https://unity8-jenkins.ubuntu.com/job/build/3202/console

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

review: Needs Fixing (continuous-integration)

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

2672. By Michael Zanetti on 2016-10-26

fix tutorial tests

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

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

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

review: Needs Fixing (continuous-integration)

[Lukáš Tinkl (lukas-kde)]

Top-approving, unrelated Launcher failures

review: Approve

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

2673. By Michael Zanetti on 2016-11-09

improve performance on BlurLayer

=== modified file 'qml/Components/BlurLayer.qml'
--- qml/Components/BlurLayer.qml	2015-09-18 11:39:22 +0000
+++ qml/Components/BlurLayer.qml	2016-11-09 13:03:30 +0000
@@ -20,50 +20,20 @@
 Item {
     id: root
 
-    property alias source: shaderEffectSource.sourceItem
-    property alias saturation: desaturateEffect.saturationValue
-    property alias blurRadius: fastBlur.radius
-
-    readonly property alias ready: shaderEffectSource.ready
-
-    ShaderEffect {
-        id: desaturateEffect
-        anchors.fill: root
-
-        property real saturationValue: 1
-
-        property variant source: ShaderEffectSource {
-            id: shaderEffectSource
-            hideSource: root.visible
-            live: !root.visible
-            property bool ready: false;
-            onLiveChanged: {
-                if (!live) {
-                    ready = false;
-                    scheduleUpdate();
-                }
-            }
-            onScheduledUpdateCompleted: ready = true;
-        }
-
-        fragmentShader: "
-            varying highp vec2 qt_TexCoord0;
-            uniform sampler2D source;
-            uniform lowp float saturationValue;
-            void main(void)
-            {
-                highp vec4 sourceColor = texture2D(source, qt_TexCoord0);
-                highp vec4 scaledColor = sourceColor * vec4(0.3, 0.59, 0.11, 1.0);
-                lowp float luminance = scaledColor.r + scaledColor.g + scaledColor.b ;
-                gl_FragColor = mix(vec4(luminance, luminance, luminance, sourceColor.a), sourceColor, saturationValue);
-            }"
-    }
+    property alias source: fastBlur.source
+    property real brightness: 1
+    property real blurRadius: 0
 
     FastBlur {
         id: fastBlur
         anchors.fill: parent
-        source: desaturateEffect
         visible: radius > 0
-        radius: 0
+        radius: Math.max(root.blurRadius, 0)
+    }
+
+    Rectangle {
+        anchors.fill: parent
+        color: "black"
+        opacity: 1 - root.brightness
     }
 }

=== modified file 'qml/Stage/Stage.qml'
--- qml/Stage/Stage.qml	2016-10-24 11:34:20 +0000
+++ qml/Stage/Stage.qml	2016-11-09 13:03:30 +0000
@@ -54,7 +54,7 @@
 
     // Used by the tutorial code
     readonly property bool spreadShown: state == "spread"
-    readonly property real rightEdgeDragProgress: rightEdgeDragArea.progress // How far left the stage has been dragged
+    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
@@ -409,12 +409,22 @@
             PropertyChanges { target: hoverMouseArea; enabled: true }
             PropertyChanges { target: rightEdgeDragArea; enabled: false }
             PropertyChanges { target: cancelSpreadMouseArea; enabled: true }
+            PropertyChanges { target: blurLayer; visible: true; blurRadius: 32; brightness: .65; opacity: 1 }
+            PropertyChanges { target: wallpaper; visible: false }
         },
         State {
             name: "stagedRightEdge"; when: (rightEdgeDragArea.dragging || edgeBarrier.progress > 0) && root.mode == "staged"
+            PropertyChanges {
+                target: blurLayer;
+                visible: true;
+                blurRadius: 32
+                brightness: .65
+                opacity: 1
+            }
         },
         State {
             name: "sideStagedRightEdge"; when: (rightEdgeDragArea.dragging || edgeBarrier.progress > 0) && root.mode == "stagedWithSideStage"
+            extend: "stagedRightEdge"
             PropertyChanges {
                 target: sideStage
                 opacity: priv.sideStageDelegate.x === sideStage.x ? 1 : 0
@@ -423,9 +433,17 @@
         },
         State {
             name: "windowedRightEdge"; when: (rightEdgeDragArea.dragging || edgeBarrier.progress > 0) && root.mode == "windowed"
+            PropertyChanges {
+                target: blurLayer;
+                visible: true
+                blurRadius: 32
+                brightness: .65
+                opacity: MathUtils.linearAnimation(spreadItem.rightEdgeBreakPoint, 1, 0, 1, Math.max(rightEdgeDragArea.progress, edgeBarrier.progress))
+            }
         },
         State {
             name: "staged"; when: root.mode === "staged"
+            PropertyChanges { target: wallpaper; visible: false }
         },
         State {
             name: "stagedWithSideStage"; when: root.mode === "stagedWithSideStage"
@@ -440,6 +458,7 @@
         Transition {
             from: "stagedRightEdge,sideStagedRightEdge,windowedRightEdge"; to: "spread"
             PropertyAction { target: spreadItem; property: "highlightedIndex"; value: -1 }
+            PropertyAnimation { target: blurLayer; properties: "brightness,blurRadius"; duration: priv.animationDuration }
         },
         Transition {
             to: "spread"
@@ -494,6 +513,13 @@
             z: -2
         }
 
+        BlurLayer {
+            id: blurLayer
+            anchors.fill: parent
+            source: wallpaper
+            visible: false
+        }
+
         Spread {
             id: spreadItem
             objectName: "spreadItem"
@@ -1730,7 +1756,7 @@
         property var gesturePoints: []
         property bool cancelled: false
 
-        property real progress: dragging ? -touchPosition.x / root.width : 0
+        property real progress: -touchPosition.x / root.width
         onProgressChanged: {
             if (dragging) {
                 draggedProgress = progress;