git.iko.soy/unity8
on xenial help sign in
Better drag area code
014ad96Albert Astals
qml/Dash/Dash.qml+5−12
compare with xenial
unifiedsplit
@@ -77,7 +77,6 @@ Showable {
77 QtObject {
77 QtObject {
78 id: overviewController
78 id: overviewController
79
79
80− property bool accepted: false
81 property alias enableAnimation: progressAnimation.enabled
80 property alias enableAnimation: progressAnimation.enabled
82 property real progress: 0
81 property real progress: 0
83 property bool showingNonFavoriteScope: false
82 property bool showingNonFavoriteScope: false
@@ -129,7 +128,6 @@ Showable {
129 function hide() {
128 function hide() {
130 overviewController.enableAnimation = true;
129 overviewController.enableAnimation = true;
131 overviewController.progress = 0;
130 overviewController.progress = 0;
132− overviewController.accepted = false;
133 }
131 }
134 function animateDashFromAll() {
132 function animateDashFromAll() {
135 var currentScopePos = scopesOverview.allScopeCardPosition(dashContent.currentScopeId);
133 var currentScopePos = scopesOverview.allScopeCardPosition(dashContent.currentScopeId);
@@ -276,27 +274,22 @@ Showable {
276 id: overviewDragHandle
274 id: overviewDragHandle
277 z: 1
275 z: 1
278 direction: Direction.Upwards
276 direction: Direction.Upwards
279− distanceThreshold: units.gu(20)
280 // TODO this needs to be disabled in a few more cases
277 // TODO this needs to be disabled in a few more cases
281− enabled: !overviewController.accepted || dragging
278+ enabled: overviewController.progress == 0 || dragging
279+
280+ readonly property real fullMovement: units.gu(20)
282
281
283 anchors { left: parent.left; right: parent.right; bottom: parent.bottom }
282 anchors { left: parent.left; right: parent.right; bottom: parent.bottom }
284 height: units.gu(2)
283 height: units.gu(2)
285
284
286 onSceneDistanceChanged: {
285 onSceneDistanceChanged: {
287 overviewController.enableAnimation = false;
286 overviewController.enableAnimation = false;
288− overviewController.progress = Math.max(0, Math.min(1, sceneDistance / distanceThreshold));
287+ overviewController.progress = Math.max(0, Math.min(1, sceneDistance / fullMovement));
289− }
290−
291− onStatusChanged: {
292− if (status == DirectionalDragArea.Recognized) {
293− overviewController.accepted = true;
294− }
295 }
288 }
296
289
297 onDraggingChanged: {
290 onDraggingChanged: {
298 overviewController.enableAnimation = true;
291 overviewController.enableAnimation = true;
299− overviewController.progress = overviewController.accepted ? 1 : 0;
292+ overviewController.progress = (overviewController.progress > 0.7) ? 1 : 0;
300 }
293 }
301 }
294 }
302
295