git.iko.soy/unity8
on xenial help sign in
forbid closing apps during the edge gesture
commitd2be534a03679a559aa9734ef03e06f230896b0e authorhandsome_feng <445865575@qq.com> dateWed 13 May 2015, 17:03 (11 years ago) parent2fa460b
2 files changed+2−2
compare with xenial
unifiedsplit
qml/Stages/PhoneStage.qml+1−1 qml/Stages/TabletStage.qml+1−1
qml/Stages/PhoneStage.qml+1−1
@@ -319,7 +319,7 @@ Rectangle {
319319 otherSelected: spreadView.selectedIndex >= 0 && !selected
320320 interactive: !spreadView.interactive && spreadView.phase === 0
321321 && spreadView.shiftedContentX === 0 && root.interactive && isFocused
322− swipeToCloseEnabled: spreadView.interactive && root.interactive && !snapAnimation.running
322+ swipeToCloseEnabled: !spreadDragArea.dragging && spreadView.interactive && root.interactive && !snapAnimation.running
323323 maximizedAppTopMargin: root.maximizedAppTopMargin
324324 dropShadow: spreadView.active ||
325325 (priv.focusedAppDelegate && priv.focusedAppDelegate.x !== 0)
qml/Stages/TabletStage.qml+1−1
@@ -503,7 +503,7 @@ Rectangle {
503503 otherSelected: spreadView.selectedIndex >= 0 && !selected
504504 isInSideStage: priv.sideStageAppId == model.appId
505505 interactive: !spreadView.interactive && spreadView.phase === 0 && root.interactive
506− swipeToCloseEnabled: spreadView.interactive && !snapAnimation.running
506+ swipeToCloseEnabled: !spreadDragArea.dragging && spreadView.interactive && !snapAnimation.running
507507 maximizedAppTopMargin: root.maximizedAppTopMargin
508508 dragOffset: !isDash && model.appId == priv.mainStageAppId && root.inverseProgress > 0 && spreadView.phase === 0 ? root.inverseProgress : 0
509509 application: ApplicationManager.get(index)