marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

actually fix activity switching

Browse source
This commit is contained in:
Marco Martin 2018-02-09 18:26:57 +01:00
parent 89fef3ed7b
commit fa8bec3fd8
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
shell/contents/views/Desktop.qml
View file

@ -81,14 +81,14 @@ MouseArea {
Connections { Connections {
target: activitiesView target: activitiesView
onMovementEnded: {return; onMovementEnded: {
if (activitiesView.currentIndex == index) { if (activitiesView.currentIndex == index) {
activityModel.setCurrentActivity(model.id, function(){ activityModel.setCurrentActivity(model.id, function(){
mainDelegate.containment.parent = mainDelegate; mainDelegate.containment.parent = mainDelegate;
}); });
} }
} }
onFlickEnded: onMovementEnded() onFlickEnded: activitiesView.movementEnded()
} }
onInViewportChanged: { onInViewportChanged: {
if (inViewport && !mainDelegate.containment) { if (inViewport && !mainDelegate.containment) {
@ -142,12 +142,6 @@ MouseArea {
onReleased: { onReleased: {
activityModel.setCurrentActivity("395250d4-d44b-4735-8494-4db49beb29dd", function(){}); activityModel.setCurrentActivity("395250d4-d44b-4735-8494-4db49beb29dd", function(){});
}*/ }*/
ActivityHandle {
mirrored: true
}
ActivityHandle {
mirrored: false
}
function toggleWidgetExplorer(containment) { function toggleWidgetExplorer(containment) {
console.log("Widget Explorer toggled"); console.log("Widget Explorer toggled");