git.iko.soy/unity8
on xenial help sign in
Don't animate x while dragging apps from the left edge Fixes: 1360105
2c7808fMichael Zanetti
qml/Stages/PhoneStage.qml+6−1
compare with xenial
unifiedsplit
@@ -44,6 +44,9 @@ Rectangle {
44 }
44 }
45
45
46 onInverseProgressChanged: {
46 onInverseProgressChanged: {
47+ // This can't be a simple binding because that would be triggered after this handler
48+ // while we need it active before doing the anition left/right
49+ priv.animateX = (inverseProgress == 0)
47 if (inverseProgress == 0 && priv.oldInverseProgress > 0) {
50 if (inverseProgress == 0 && priv.oldInverseProgress > 0) {
48 // left edge drag released. Minimum distance is given by design.
51 // left edge drag released. Minimum distance is given by design.
49 if (priv.oldInverseProgress > units.gu(22)) {
52 if (priv.oldInverseProgress > units.gu(22)) {
@@ -92,6 +95,7 @@ Rectangle {
92 property var focusedAppDelegate: null
95 property var focusedAppDelegate: null
93
96
94 property real oldInverseProgress: 0
97 property real oldInverseProgress: 0
98+ property bool animateX: true
95
99
96 onFocusedAppIdChanged: focusedAppDelegate = spreadRepeater.itemAt(0);
100 onFocusedAppIdChanged: focusedAppDelegate = spreadRepeater.itemAt(0);
97
101
@@ -311,7 +315,8 @@ Rectangle {
311 Behavior on x {
315 Behavior on x {
312 enabled: root.spreadEnabled &&
316 enabled: root.spreadEnabled &&
313 !spreadView.active &&
317 !spreadView.active &&
314− !snapAnimation.running
318+ !snapAnimation.running &&
319+ priv.animateX
315 UbuntuNumberAnimation {
320 UbuntuNumberAnimation {
316 duration: UbuntuAnimation.FastDuration
321 duration: UbuntuAnimation.FastDuration
317 onRunningChanged: {
322 onRunningChanged: {
qml/Stages/TabletStage.qml+5
@@ -36,6 +36,9 @@ Rectangle {
36 property real inverseProgress: 0 // This is the progress for left edge drags, in pixels.
36 property real inverseProgress: 0 // This is the progress for left edge drags, in pixels.
37
37
38 onInverseProgressChanged: {
38 onInverseProgressChanged: {
39+ // This can't be a simple binding because that would be triggered after this handler
40+ // while we need it active before doing the anition left/right
41+ spreadView.animateX = (inverseProgress == 0)
39 if (inverseProgress == 0 && priv.oldInverseProgress > 0) {
42 if (inverseProgress == 0 && priv.oldInverseProgress > 0) {
40 // left edge drag released. Minimum distance is given by design.
43 // left edge drag released. Minimum distance is given by design.
41 if (priv.oldInverseProgress > units.gu(22)) {
44 if (priv.oldInverseProgress > units.gu(22)) {
@@ -193,6 +196,8 @@ Rectangle {
193 property int draggedDelegateCount: 0
196 property int draggedDelegateCount: 0
194 property int closingIndex: -1
197 property int closingIndex: -1
195
198
199+ property bool animateX: true
200+
196 property bool sideStageDragging: sideStageDragHandle.dragging
201 property bool sideStageDragging: sideStageDragHandle.dragging
197 property real sideStageDragProgress: sideStageDragHandle.progress
202 property real sideStageDragProgress: sideStageDragHandle.progress
198
203
qml/Stages/TransformedTabletSpreadDelegate.qml+2−1
@@ -138,7 +138,8 @@ SpreadDelegate {
138 enabled: !spreadView.active &&
138 enabled: !spreadView.active &&
139 !snapAnimation.running &&
139 !snapAnimation.running &&
140 model.appId !== "unity8-dash" &&
140 model.appId !== "unity8-dash" &&
141− !spreadView.sideStageDragging
141+ !spreadView.sideStageDragging &&
142+ spreadView.animateX
142 UbuntuNumberAnimation {
143 UbuntuNumberAnimation {
143 duration: UbuntuAnimation.FastDuration
144 duration: UbuntuAnimation.FastDuration
144 }
145 }