Unity 8

Merge lp:~mzanetti/unity8/ubuntuanimations into lp:unity8

ubuntuanimations
Merge into trunk

Proposed by Michael Zanetti on 2015-11-03

Status:

Merged

Approved by:

Albert Astals Cid on 2015-11-13

Approved revision:

2030

Merged at revision:

2048

Proposed branch:

lp:~mzanetti/unity8/ubuntuanimations

Merge into:

lp:unity8

Prerequisite:

lp:~mzanetti/unity8/fix-apps-under-panel

Diff against target:

122 lines (+35/-26)

2 files modified

qml/Stages/DesktopStage.qml (+34/-26)
tests/qmltests/tst_Shell.qml (+1/-0)

To merge this branch:

bzr merge lp:~mzanetti/unity8/ubuntuanimations

Low

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Albert Astals Cid (community)			Abstain on 2015-11-13
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-11-12
Lukáš Tinkl (community)		2015-11-03	Approve on 2015-11-03
Review via email: mp+276511@code.launchpad.net

This proposal supersedes a proposal from 2015-11-03.

Commit Message

use UbuntuNumberAnimations instead of linear ones for window state transitions

Description of the Change

* 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

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

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?

changed as peer design feedback

Lukáš Tinkl (lukas-kde) wrote on 2015-11-03:

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

Still didn't run, tested locally

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

Yes

review: Approve

PS Jenkins bot (ps-jenkins) wrote on 2015-11-03:

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

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2015-11-06:

Note: was top approved already

Text conflict in qml/Panel/Panel.qml
Text conflict in qml/Stages/DesktopStage.qml
Text conflict in qml/Stages/WindowResizeArea.qml
Text conflict in tests/qmltests/Stages/tst_DesktopStage.qml
Text conflict in tests/qmltests/Stages/tst_WindowResizeArea.qml
Text conflict in tests/qmltests/tst_Shell.qml
6 conflicts encountered.

Maybe these conflicts are from the parent branch totally but better to remerge all the chain

review: Needs Fixing

lp:~mzanetti/unity8/ubuntuanimations updated on 2015-11-09

2027. By Michael Zanetti on 2015-11-09: merge prereq
2028. By Michael Zanetti on 2015-11-09: update after merging

PS Jenkins bot (ps-jenkins) wrote on 2015-11-09:

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

review: Needs Fixing (continuous-integration)

Francis Ginther (fginther) wrote on 2015-11-09:

I've restarted this MP to work around an issue triggering generic-deb-autopilot-vivid-touch on krillin hardware.

PS Jenkins bot (ps-jenkins) wrote on 2015-11-09:

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-11-09:

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

review: Needs Fixing (continuous-integration)

lp:~mzanetti/unity8/ubuntuanimations updated on 2015-11-12

2029. By Michael Zanetti on 2015-11-12: mrege prereq

PS Jenkins bot (ps-jenkins) wrote on 2015-11-12:

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

review: Needs Fixing (continuous-integration)

lp:~mzanetti/unity8/ubuntuanimations updated on 2015-11-12

2030. By Michael Zanetti on 2015-11-12: wait for animations to be finished before destroying the test

PS Jenkins bot (ps-jenkins) wrote on 2015-11-12:

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

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2015-11-13:

Merged and CI "passes" re-top approving.

review: Abstain

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Michael Zanetti

Mohammad Rakibul Hasan

Unity Team

 === modified file 'qml/Stages/DesktopStage.qml'
 --- qml/Stages/DesktopStage.qml	2015-11-12 18:05:13 +0000
 +++ qml/Stages/DesktopStage.qml	2015-11-12 18:05:13 +0000
@@ -223,10 +223,18 @@
                  height: units.gu(50)
                  focus: appId === priv.focusedAppId
--                property bool maximized: false
--                property bool maximizedLeft: false
--                property bool maximizedRight: false
--                property bool minimized: false
++                QtObject {
++                    id: appDelegatePrivate
++                    property bool maximized: false
++                    property bool maximizedLeft: false
++                    property bool maximizedRight: false
++                    property bool minimized: false
++                }
++                readonly property alias maximized: appDelegatePrivate.maximized
++                readonly property alias maximizedLeft: appDelegatePrivate.maximizedLeft
++                readonly property alias maximizedRight: appDelegatePrivate.maximizedRight
++                readonly property alias minimized: appDelegatePrivate.minimized
++
                  readonly property string appId: model.appId
                  property bool animationsEnabled: true
                  property alias title: decoratedWindow.title
@@ -260,38 +268,38 @@
                  function maximize(animated) {
                      animationsEnabled = (animated === undefined) || animated;
--                    minimized = false;
--                    maximized = true;
--                    maximizedLeft = false;
--                    maximizedRight = false;
++                    appDelegatePrivate.minimized = false;
++                    appDelegatePrivate.maximized = true;
++                    appDelegatePrivate.maximizedLeft = false;
++                    appDelegatePrivate.maximizedRight = false;
+                 }
                  function maximizeLeft() {
--                    minimized = false;
--                    maximized = false;
--                    maximizedLeft = true;
--                    maximizedRight = false;
++                    appDelegatePrivate.minimized = false;
++                    appDelegatePrivate.maximized = false;
++                    appDelegatePrivate.maximizedLeft = true;
++                    appDelegatePrivate.maximizedRight = false;
+                 }
                  function maximizeRight() {
--                    minimized = false;
--                    maximized = false;
--                    maximizedLeft = false;
--                    maximizedRight = true;
++                    appDelegatePrivate.minimized = false;
++                    appDelegatePrivate.maximized = false;
++                    appDelegatePrivate.maximizedLeft = false;
++                    appDelegatePrivate.maximizedRight = true;
+                 }
                  function minimize(animated) {
                      animationsEnabled = (animated === undefined) || animated;
--                    maximized = false;
--                    minimized = true;
++                    appDelegatePrivate.maximized = false;
++                    appDelegatePrivate.minimized = true;
+                 }
                  function restore(animated) {
                      animationsEnabled = (animated === undefined) || animated;
--                    minimized = false;
--                    maximized = false;
--                    maximizedLeft = false;
--                    maximizedRight = false;
++                    appDelegatePrivate.minimized = false;
++                    appDelegatePrivate.maximized = false;
++                    appDelegatePrivate.maximizedLeft = false;
++                    appDelegatePrivate.maximizedRight = false;
+                 }
                  function restoreFromMinimized(animated) {
                      animationsEnabled = (animated === undefined) || animated;
--                    minimized = false;
++                    appDelegatePrivate.minimized = false;
                      if (maximized)
                          maximize();
                      else if (maximizedLeft)
@@ -347,14 +355,14 @@
                          to: "normal"
                          enabled: appDelegate.animationsEnabled
                          PropertyAction { target: appDelegate; properties: "visuallyMinimized,visuallyMaximized" }
--                        PropertyAnimation { target: appDelegate; properties: "x,y,opacity,width,height,scale" }
++                        UbuntuNumberAnimation { target: appDelegate; properties: "x,y,opacity,width,height,scale"; duration: UbuntuAnimation.FastDuration }
                      },
                      Transition {
                          to: "maximized"
                          enabled: appDelegate.animationsEnabled
                          PropertyAction { target: appDelegate; property: "visuallyMinimized" }
                          SequentialAnimation {
--                            PropertyAnimation { target: appDelegate; properties: "x,y,opacity,width,height,scale" }
++                            UbuntuNumberAnimation { target: appDelegate; properties: "x,y,opacity,width,height,scale"; duration: UbuntuAnimation.FastDuration }
                              PropertyAction { target: appDelegate; property: "visuallyMaximized" }
+                         }
                      },
@@ -363,7 +371,7 @@
                          enabled: appDelegate.animationsEnabled
                          PropertyAction { target: appDelegate; property: "visuallyMaximized" }
                          SequentialAnimation {
--                            PropertyAnimation { target: appDelegate; properties: "x,y,opacity,width,height,scale" }
++                            UbuntuNumberAnimation { target: appDelegate; properties: "x,y,opacity,width,height,scale"; duration: UbuntuAnimation.FastDuration }
                              PropertyAction { target: appDelegate; property: "visuallyMinimized" }
                              ScriptAction {
                                  script: {
 === modified file 'tests/qmltests/tst_Shell.qml'
 --- tests/qmltests/tst_Shell.qml	2015-11-12 18:05:13 +0000
 +++ tests/qmltests/tst_Shell.qml	2015-11-12 18:05:13 +0000
@@ -313,6 +313,7 @@
+         }
          function cleanup() {
++            waitForRendering(shell);
              mouseEmulation.checked = true;
              tryCompare(shell, "enabled", true); // make sure greeter didn't leave us in disabled state
              tearDown();