From fa8bec3fd8f89ee4e8b6dc8620c516927ef3c34a Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Fri, 9 Feb 2018 18:26:57 +0100 Subject: [PATCH] actually fix activity switching --- shell/contents/views/Desktop.qml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/shell/contents/views/Desktop.qml b/shell/contents/views/Desktop.qml index 9c0664b3..f8ebb025 100644 --- a/shell/contents/views/Desktop.qml +++ b/shell/contents/views/Desktop.qml @@ -81,14 +81,14 @@ MouseArea { Connections { target: activitiesView - onMovementEnded: {return; + onMovementEnded: { if (activitiesView.currentIndex == index) { activityModel.setCurrentActivity(model.id, function(){ mainDelegate.containment.parent = mainDelegate; }); } } - onFlickEnded: onMovementEnded() + onFlickEnded: activitiesView.movementEnded() } onInViewportChanged: { if (inViewport && !mainDelegate.containment) { @@ -142,12 +142,6 @@ MouseArea { onReleased: { activityModel.setCurrentActivity("395250d4-d44b-4735-8494-4db49beb29dd", function(){}); }*/ - ActivityHandle { - mirrored: true - } - ActivityHandle { - mirrored: false - } function toggleWidgetExplorer(containment) { console.log("Widget Explorer toggled");