git.iko.soy/unity8
on xenial help sign in
fix trust prompt animation
commitfa88508ee156d8bc5c40299024b504e8ea23a220 authorMichael Zanetti <michael.zanetti@canonical.com> dateThu 8 Sep 2016, 19:14 (10 years ago) parente10b262
4 files changed+12−5
compare with xenial
unifiedsplit
debian/changelog+6 qml/Stage/PromptSurfaceAnimations.qml+3−3 qml/Stage/Stage.qml+2−2 qml/Stage/SurfaceContainer.qml+1
debian/changelog+6
@@ -1,3 +1,9 @@
1+unity8 (8.14+16.10.20160831.3-0ubuntu1local~1473354833) UNRELEASED; urgency=medium
2+
3+ * ''
4+
5+ -- Michael Zanetti <michael.zanetti@canonical.com> Thu, 08 Sep 2016 19:13:54 +0200
6+
17unity8 (8.14+16.10.20160831.3-0ubuntu1) yakkety; urgency=medium
28
39 [ Daniel d'Andrada ]
qml/Stage/PromptSurfaceAnimations.qml+3−3
@@ -22,6 +22,7 @@ StateGroup {
2222 property var container
2323 property var surfaceItem
2424
25+ onStateChanged: print("++++++++++++++++++++++++ surface animation state change", state)
2526 states: [
2627 State {
2728 name: "blank"
@@ -43,7 +44,7 @@ StateGroup {
4344 SequentialAnimation {
4445 // clip so we don't go out of parent's bounds during spread
4546 PropertyAction { target: root.container.parent; property: "clip"; value: true }
46− UbuntuNumberAnimation { target: root.surfaceItem; property: "y"; to: root.container.height
47+ UbuntuNumberAnimation { target: root.surfaceItem; property: "anchors.topMargin"; to: root.container.height
4748 duration: UbuntuAnimation.BriskDuration }
4849 PropertyAction { target: root.surfaceItem; property: "visible"; value: false }
4950 PropertyAction { target: container.parent; property: "clip"; value: false }
@@ -61,11 +62,10 @@ StateGroup {
6162 // clip so we don't go out of parent's bounds during spread
6263 PropertyAction { target: root.container.parent; property: "clip"; value: true }
6364 ScriptAction { script: {
64− root.surfaceItem.y = root.container.height;
6565 root.surfaceItem.visible = true;
6666 } }
6767 UbuntuNumberAnimation {
68− target: root.surfaceItem; property: "y"; to: 0
68+ target: root.surfaceItem; property: "anchors.topMargin"; from: root.container.height; to: 0
6969 duration: UbuntuAnimation.BriskDuration
7070 }
7171 PropertyAction { target: container.parent; property: "clip"; value: false }
qml/Stage/Stage.qml+2−2
@@ -146,8 +146,8 @@ AbstractStage {
146146
147147 property bool goneToSpread: false
148148 property int closingIndex: -1
149− property int animationDuration: 4000
150−// property int animationDuration: UbuntuAnimation.FastDuration
149+// property int animationDuration: 4000
150+ property int animationDuration: UbuntuAnimation.FastDuration
151151
152152 function updateForegroundMaximizedApp() {
153153 var found = false;
qml/Stage/SurfaceContainer.qml+1
@@ -139,6 +139,7 @@ FocusScope {
139139 objectName: "animationsLoader"
140140 active: root.surface
141141 source: {
142+ print("++++++++++++++++++++++++++++++++++++++++++++ loading animation!!!", root.isPromptSurface, surfaceItem, root)
142143 if (root.isPromptSurface) {
143144 return "PromptSurfaceAnimations.qml";
144145 } else {