Merge into trunk : spread-visual-updates : Code : Unity 8

Reviewer	Review Type	Date Requested	Status
Lukáš Tinkl (community)		2016-02-25	Approve on 2016-03-10
PS Jenkins bot (community)	continuous-integration	2016-02-25	Needs Fixing on 2016-02-25
Unity8 CI Bot	continuous-integration	2016-02-25	Approve on 2016-02-25
Review via email: mp+287171@code.launchpad.net

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-12-09: Posted in a previous version of this proposal

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6902/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-12-09: Posted in a previous version of this proposal

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6904/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2015-12-14: Posted in a previous version of this proposal

#

Text conflict in qml/Stages/DesktopStage.qml
1 conflicts encountered.

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2015-12-15: Posted in a previous version of this proposal

#

> Text conflict in qml/Stages/DesktopStage.qml
> 1 conflicts encountered.

merged

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-12-15: Posted in a previous version of this proposal

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6953/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-01-13: Posted in a previous version of this proposal

#

PASSED: Continuous integration, rev:2082
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/23/
Executed test runs:

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

review: Approve (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-01-15: Posted in a previous version of this proposal

#

PASSED: Continuous integration, rev:2083
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/99/
Executed test runs:

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

review: Approve (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-01-15: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:2083
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/99/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-25:

#

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

PASSED: Continuous integration, rev:2086
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/489/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/651
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay/216
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial/216
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/674
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/692
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/692
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/688
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/688/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/688
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/688/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/688
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/688/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/688
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/688/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/688
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/688/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/688
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/688/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-02-25:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7419/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2016-03-10:

#

* 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.

Yes

* Did you make sure that the branch does not contain spurious tags?

Yes

review: Approve

Unity 8

Merge lp:~mzanetti/unity8/spread-visual-updates into lp:unity8

Commit message

Description of the change

Preview Diff

Subscribers

 === modified file 'qml/Components/EdgeBarrier.qml'
 --- qml/Components/EdgeBarrier.qml	2015-11-24 17:44:18 +0000
 +++ qml/Components/EdgeBarrier.qml	2016-02-25 13:03:25 +0000
@@ -105,7 +105,7 @@
          },
          Transition {
              from: "resisting"; to: "passed"
--            UbuntuNumberAnimation { target: materialContainer; property: "opacity" }
++            UbuntuNumberAnimation { duration: UbuntuAnimation.BriskDuration; target: materialContainer; property: "opacity" }
+         }
+     ]
+ }
 === modified file 'qml/Launcher/Launcher.qml'
 --- qml/Launcher/Launcher.qml	2016-02-25 13:03:24 +0000
 +++ qml/Launcher/Launcher.qml	2016-02-25 13:03:25 +0000
@@ -328,8 +328,8 @@
                      rotation: -90
                      anchors.centerIn: parent
                      gradient: Gradient {
--                        GradientStop { position: 0.0; color: panel.color}
--                        GradientStop { position: 1.0; color: Qt.rgba(panel.r,panel.g,panel.b,0)}
++                        GradientStop { position: 0.0; color: Qt.rgba(panel.color.r, panel.color.g, panel.color.b, .5)}
++                        GradientStop { position: 1.0; color: Qt.rgba(panel.color.r,panel.color.g,panel.color.b,0)}
+                     }
+                 }
+             }
 === modified file 'qml/Stages/DesktopSpread.qml'
 --- qml/Stages/DesktopSpread.qml	2015-11-24 17:44:18 +0000
 +++ qml/Stages/DesktopSpread.qml	2016-02-25 13:03:25 +0000
@@ -19,6 +19,7 @@
  import Ubuntu.Components 1.3
  import Ubuntu.Gestures 0.1
  import Unity.Application 0.1
++import "../Components"
  FocusScope {
      id: root
@@ -26,8 +27,11 @@
      property bool altTabPressed: false
      property Item workspace: null
++    readonly property alias ready: blurLayer.ready
      readonly property alias highlightedIndex: spreadRepeater.highlightedIndex
++    signal playFocusAnimation(int index)
++
      function show() {
          spreadContainer.animateIn = true;
          root.state = "altTab";
@@ -91,6 +95,9 @@
      function focusSelected() {
          if (spreadRepeater.highlightedIndex != -1) {
++            if (spreadContainer.visible) {
++                root.playFocusAnimation(spreadRepeater.highlightedIndex)
++            }
              var application = ApplicationManager.get(spreadRepeater.highlightedIndex);
              ApplicationManager.requestFocusApplication(application.appId);
+         }
@@ -101,6 +108,31 @@
          state = ""
+     }
++    BlurLayer {
++        id: blurLayer
++        anchors.fill: parent
++        source: root.workspace
++        visible: false
++    }
++
++    Rectangle {
++        id: spreadBackground
++        anchors.fill: parent
++        color: "#B2000000"
++        visible: false
++        opacity: visible ? 1 : 0
++        Behavior on opacity {
++            UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration }
++        }
++    }
++
++    MouseArea {
++        id: eventEater
++        anchors.fill: parent
++        visible: spreadBackground.visible
++        enabled: visible
++    }
++
      Item {
          id: spreadContainer
          objectName: "spreadContainer"
@@ -226,13 +258,20 @@
                      Transition {
                          from: ""
                          to: "altTab"
--                        PropertyAction { target: spreadDelegate; properties: "y,height,width,angle,z,itemScale,itemScaleOriginY,visible" }
--                        PropertyAction { target: clippedSpreadDelegate; properties: "anchors.topMargin" }
--                        PropertyAnimation {
--                            target: spreadDelegate; properties: "x"
--                            from: root.width
--                            duration: spreadContainer.animateIn ? UbuntuAnimation.FastDuration :0
--                            easing: UbuntuAnimation.StandardEasing
++                        SequentialAnimation {
++                            ParallelAnimation {
++                                PropertyAction { target: spreadDelegate; properties: "y,height,width,angle,z,itemScale,itemScaleOriginY,visible" }
++                                PropertyAction { target: clippedSpreadDelegate; properties: "anchors.topMargin" }
++                                PropertyAnimation {
++                                    target: spreadDelegate; properties: "x"
++                                    from: root.width
++                                    duration: spreadContainer.animateIn ? UbuntuAnimation.FastDuration :0
++                                    easing: UbuntuAnimation.StandardEasing
++                                }
++                                UbuntuNumberAnimation { target: clippedSpreadDelegate; property: "shadowOpacity"; from: 0; to: spreadMaths.shadowOpacity; duration: spreadContainer.animateIn ? UbuntuAnimation.FastDuration : 0 }
++                                UbuntuNumberAnimation { target: tileInfo; property: "opacity"; from: 0; to: spreadMaths.tileInfoOpacity; duration: spreadContainer.animateIn ? UbuntuAnimation.FastDuration : 0 }
++                            }
++                            PropertyAction { target: spreadSelectArea; property: "enabled" }
+                         }
+                     }
+                 ]
@@ -262,12 +301,20 @@
                          anchors { left: parent.left; top: parent.top; right: parent.right }
                          spacing: units.gu(1)
--                        UbuntuShape {
++                        UbuntuShapeForItem {
                              Layout.preferredHeight: Math.min(units.gu(6), root.height * .05)
                              Layout.preferredWidth: height * 8 / 7.6
                              image: Image {
                                  anchors.fill: parent
                                  source: model.icon
++                                Rectangle {
++                                    anchors.fill: parent
++                                    color: "black"
++                                    opacity: clippedSpreadDelegate.highlightShown ? 0 : .1
++                                    Behavior on opacity {
++                                        UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration }
++                                    }
++                                }
+                             }
+                         }
                          Label {
@@ -420,7 +467,7 @@
                              property var source: ShaderEffectSource {
                                  id: shaderEffectSource
--                                sourceItem: appContainer
++                                sourceItem: root.workspace
+                             }
                              fragmentShader: "
@@ -494,20 +541,17 @@
              from: "*"
              to: "altTab"
              SequentialAnimation {
--                PropertyAction { target: hoverMouseArea; property: "progressiveScrollingEnabled"; value: false }
                  PropertyAction { target: spreadRepeater; property: "highlightedIndex"; value: Math.min(ApplicationManager.count - 1, 1) }
--                PauseAnimation { duration: 140 }
++                PauseAnimation { duration: spreadContainer.animateIn ? 0 : 140 }
                  PropertyAction { target: workspaceSelector; property: "visible" }
                  PropertyAction { target: spreadContainer; property: "visible" }
                  ParallelAnimation {
--                    UbuntuNumberAnimation {
--                        target: blurLayer; properties: "saturation,blurRadius";
--                        duration: spreadContainer.animateIn ? UbuntuAnimation.FastDuration : 0
--                    }
++                    UbuntuNumberAnimation { target: blurLayer; properties: "saturation,blurRadius"; duration: UbuntuAnimation.SnapDuration }
                      PropertyAction { target: spreadFlickable; property: "visible" }
                      PropertyAction { targets: [currentSelectedLabel,spreadBackground]; property: "visible" }
                      PropertyAction { target: spreadFlickable; property: "contentX"; value: 0 }
+                 }
++                PropertyAction { target: hoverMouseArea; properties: "enabled,progressiveScrollingEnabled"; value: false }
+             }
          },
          Transition {
@@ -518,6 +562,5 @@
              PropertyAction { target: spreadRepeater; property: "highlightedIndex"; value: -1 }
              PropertyAction { target: spreadContainer; property: "animateIn"; value: false }
+         }
--
+     ]
+ }
 === modified file 'qml/Stages/DesktopSpreadDelegate.qml'
 --- qml/Stages/DesktopSpreadDelegate.qml	2015-12-01 12:17:24 +0000
 +++ qml/Stages/DesktopSpreadDelegate.qml	2016-02-25 13:03:25 +0000
@@ -56,6 +56,11 @@
+         }
+     ]
++    scale: highlightShown ? 1.025 : 1
++    Behavior on scale {
++        UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration }
++    }
++
      BorderImage {
          anchors {
              fill: root
@@ -70,7 +75,7 @@
          anchors.fill: parent
          anchors.margins: -units.gu(1)
          color: "white"
--        opacity: highlightShown ? 0.15 : 0
++        opacity: highlightShown ? 0.55 : 0
          antialiasing: true
+     }
@@ -108,4 +113,13 @@
+             ]
+         }
+     }
++
++    Rectangle {
++        anchors.fill: parent
++        color: "black"
++        opacity: root.highlightShown ? 0 : .1
++        Behavior on opacity {
++            UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration }
++        }
++    }
+ }
 === modified file 'qml/Stages/DesktopStage.qml'
 --- qml/Stages/DesktopStage.qml	2016-02-25 13:03:24 +0000
 +++ qml/Stages/DesktopStage.qml	2016-02-25 13:03:25 +0000
@@ -350,6 +350,19 @@
                      ApplicationManager.focusApplication(appId);
+                 }
++                function playFocusAnimation() {
++                    focusAnimation.start()
++                }
++
++                UbuntuNumberAnimation {
++                    id: focusAnimation
++                    target: appDelegate
++                    property: "scale"
++                    from: 0.98
++                    to: 1
++                    duration: UbuntuAnimation.SnapDuration
++                }
++
                  states: [
                      State {
                          name: "fullscreen"; when: decoratedWindow.fullscreen
@@ -440,7 +453,7 @@
                      target: appDelegate
                      property: "z"
                      value: ApplicationManager.count + 1
--                    when: index == spread.highlightedIndex && blurLayer.ready
++                    when: index == spread.highlightedIndex && spread.ready
+                 }
                  WindowResizeArea {
@@ -476,27 +489,6 @@
+         }
+     }
--    BlurLayer {
--        id: blurLayer
--        anchors.fill: appContainer
--        source: appContainer
--        visible: false
--    }
--
--    Rectangle {
--        id: spreadBackground
--        anchors.fill: parent
--        color: "#55000000"
--        visible: false
--    }
--
--    MouseArea {
--        id: eventEater
--        anchors.fill: parent
--        visible: spreadBackground.visible
--        enabled: visible
--    }
--
      EdgeBarrier {
          id: edgeBarrier
@@ -512,7 +504,7 @@
                      rotation: 90
                      anchors.centerIn: parent
                      gradient: Gradient {
--                        GradientStop { position: 0.0; color: Qt.rgba(0.16,0.16,0.16,0.7)}
++                        GradientStop { position: 0.0; color: Qt.rgba(0.16,0.16,0.16,0.5)}
                          GradientStop { position: 1.0; color: Qt.rgba(0.16,0.16,0.16,0)}
+                     }
+                 }
@@ -534,5 +526,9 @@
          workspace: appContainer
          focus: state == "altTab"
          altTabPressed: root.altTabPressed
++
++        onPlayFocusAnimation: {
++            appRepeater.itemAt(index).playFocusAnimation();
++        }
+     }
+ }
 === modified file 'tests/qmltests/Stages/tst_DesktopStage.qml'
 --- tests/qmltests/Stages/tst_DesktopStage.qml	2016-02-03 14:00:47 +0000
 +++ tests/qmltests/Stages/tst_DesktopStage.qml	2016-02-25 13:03:25 +0000
@@ -65,8 +65,9 @@
          property bool itemDestroyed: false
          sourceComponent: Component {
              DesktopStage {
--                color: "darkblue"
++                color: "white"
                  anchors.fill: parent
++                background: "../../../qml/graphics/tablet_background.jpg"
                  Component.onCompleted: {
                      edgeBarrierControls.target = testCase.findChild(this, "edgeBarrierController");