git.iko.soy/unity8
on xenial help sign in
Disabling DDA when Spread is in stage 2, now that DDA can handle being disabled while being dragged
def081dMichael Zanetti
qml/Stages/PhoneStage.qml+2−2
compare with xenial
unifiedsplit
@@ -239,7 +239,7 @@ Item {
239 EdgeDragArea {
239 EdgeDragArea {
240 id: spreadDragArea
240 id: spreadDragArea
241 direction: Direction.Leftwards
241 direction: Direction.Leftwards
242− enabled: ApplicationManager.count > 1
242+ enabled: ApplicationManager.count > 1 && spreadView.stage != 2
243
243
244 anchors { top: parent.top; right: parent.right; bottom: parent.bottom }
244 anchors { top: parent.top; right: parent.right; bottom: parent.bottom }
245 width: root.dragAreaWidth
245 width: root.dragAreaWidth
@@ -249,7 +249,7 @@ Item {
249 property var gesturePoints: new Array()
249 property var gesturePoints: new Array()
250
250
251 onTouchXChanged: {
251 onTouchXChanged: {
252− if (!dragging && !priv.waitingForScreenshot && spreadView.stage !== 2) {
252+ if (!dragging && !priv.waitingForScreenshot) {
253 priv.requestNewScreenshot();
253 priv.requestNewScreenshot();
254 spreadView.stage = 0;
254 spreadView.stage = 0;
255 spreadView.contentX = -spreadView.shift;
255 spreadView.contentX = -spreadView.shift;