git.iko.soy/unity8
on xenial help sign in
fix trust prompt animation
fa88508Michael Zanetti
debian/changelog+6
compare with xenial
unifiedsplit
@@ -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+
1unity8 (8.14+16.10.20160831.3-0ubuntu1) yakkety; urgency=medium
7unity8 (8.14+16.10.20160831.3-0ubuntu1) yakkety; urgency=medium
2
8
3 [ Daniel d'Andrada ]
9 [ Daniel d'Andrada ]
qml/Stage/PromptSurfaceAnimations.qml+3−3
@@ -22,6 +22,7 @@ StateGroup {
22 property var container
22 property var container
23 property var surfaceItem
23 property var surfaceItem
24
24
25+ onStateChanged: print("++++++++++++++++++++++++ surface animation state change", state)
25 states: [
26 states: [
26 State {
27 State {
27 name: "blank"
28 name: "blank"
@@ -43,7 +44,7 @@ StateGroup {
43 SequentialAnimation {
44 SequentialAnimation {
44 // clip so we don't go out of parent's bounds during spread
45 // clip so we don't go out of parent's bounds during spread
45 PropertyAction { target: root.container.parent; property: "clip"; value: true }
46 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
47 duration: UbuntuAnimation.BriskDuration }
48 duration: UbuntuAnimation.BriskDuration }
48 PropertyAction { target: root.surfaceItem; property: "visible"; value: false }
49 PropertyAction { target: root.surfaceItem; property: "visible"; value: false }
49 PropertyAction { target: container.parent; property: "clip"; value: false }
50 PropertyAction { target: container.parent; property: "clip"; value: false }
@@ -61,11 +62,10 @@ StateGroup {
61 // clip so we don't go out of parent's bounds during spread
62 // clip so we don't go out of parent's bounds during spread
62 PropertyAction { target: root.container.parent; property: "clip"; value: true }
63 PropertyAction { target: root.container.parent; property: "clip"; value: true }
63 ScriptAction { script: {
64 ScriptAction { script: {
64− root.surfaceItem.y = root.container.height;
65 root.surfaceItem.visible = true;
65 root.surfaceItem.visible = true;
66 } }
66 } }
67 UbuntuNumberAnimation {
67 UbuntuNumberAnimation {
68− target: root.surfaceItem; property: "y"; to: 0
68+ target: root.surfaceItem; property: "anchors.topMargin"; from: root.container.height; to: 0
69 duration: UbuntuAnimation.BriskDuration
69 duration: UbuntuAnimation.BriskDuration
70 }
70 }
71 PropertyAction { target: container.parent; property: "clip"; value: false }
71 PropertyAction { target: container.parent; property: "clip"; value: false }
qml/Stage/Stage.qml+2−2
@@ -146,8 +146,8 @@ AbstractStage {
146
146
147 property bool goneToSpread: false
147 property bool goneToSpread: false
148 property int closingIndex: -1
148 property int closingIndex: -1
149− property int animationDuration: 4000
149+// property int animationDuration: 4000
150−// property int animationDuration: UbuntuAnimation.FastDuration
150+ property int animationDuration: UbuntuAnimation.FastDuration
151
151
152 function updateForegroundMaximizedApp() {
152 function updateForegroundMaximizedApp() {
153 var found = false;
153 var found = false;
qml/Stage/SurfaceContainer.qml+1
@@ -139,6 +139,7 @@ FocusScope {
139 objectName: "animationsLoader"
139 objectName: "animationsLoader"
140 active: root.surface
140 active: root.surface
141 source: {
141 source: {
142+ print("++++++++++++++++++++++++++++++++++++++++++++ loading animation!!!", root.isPromptSurface, surfaceItem, root)
142 if (root.isPromptSurface) {
143 if (root.isPromptSurface) {
143 return "PromptSurfaceAnimations.qml";
144 return "PromptSurfaceAnimations.qml";
144 } else {
145 } else {