on xenial help sign in
Disabling DDA when Spread is in stage 2, now that DDA can handle being disabled while being dragged
commitdef081de6120643d45b476fcbbece1c5d5dcab88 authorMichael Zanetti <michael.zanetti@canonical.com> dateThu 13 Mar 2014, 17:27 (13 years ago) parent7b08115
1 file changed+2−2
qml/Stages/PhoneStage.qml+2−2
qml/Stages/PhoneStage.qml+2−2
@@ -239,7 +239,7 @@ Item {
239239 EdgeDragArea {
240240 id: spreadDragArea
241241 direction: Direction.Leftwards
242− enabled: ApplicationManager.count > 1
242+ enabled: ApplicationManager.count > 1 && spreadView.stage != 2
243243
244244 anchors { top: parent.top; right: parent.right; bottom: parent.bottom }
245245 width: root.dragAreaWidth
@@ -249,7 +249,7 @@ Item {
249249 property var gesturePoints: new Array()
250250
251251 onTouchXChanged: {
252− if (!dragging && !priv.waitingForScreenshot && spreadView.stage !== 2) {
252+ if (!dragging && !priv.waitingForScreenshot) {
253253 priv.requestNewScreenshot();
254254 spreadView.stage = 0;
255255 spreadView.contentX = -spreadView.shift;