From 5bd4bbe18890e6e62aa7a1f65adc6a4292fd5080 Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Sat, 21 Oct 2017 00:20:04 +0300 Subject: [PATCH] play launcher removal animation correct --when a launcher belonged at all activities and the user was pinning at an another explicit activity that wasnt the current one the removal animation wasnt played correctly --- plasmoid/package/contents/ui/ContextMenu.qml | 4 ++++ plasmoid/package/contents/ui/main.qml | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/plasmoid/package/contents/ui/ContextMenu.qml b/plasmoid/package/contents/ui/ContextMenu.qml index 8fcd1fa44..0c91249eb 100644 --- a/plasmoid/package/contents/ui/ContextMenu.qml +++ b/plasmoid/package/contents/ui/ContextMenu.qml @@ -688,6 +688,10 @@ PlasmaComponents.ContextMenu { if (latteDock && latteDock.launchersGroup >= Latte.Dock.LayoutLaunchers) { latteDock.universalLayoutManager.launchersSignals.addLauncherToActivity(latteDock.launchersGroup, url, id); } else { + if (id !== tasksModel.activity && (activities[0] === "00000000-0000-0000-0000-000000000000")) { + root.launcherForRemoval = url; + } + tasksModel.requestAddLauncherToActivity(url, id); } } else { diff --git a/plasmoid/package/contents/ui/main.qml b/plasmoid/package/contents/ui/main.qml index f5e85ab8e..cc0cdbc25 100644 --- a/plasmoid/package/contents/ui/main.qml +++ b/plasmoid/package/contents/ui/main.qml @@ -1361,6 +1361,12 @@ Item { function extSignalAddLauncherToActivity(group, launcher, activity) { if (group === latteDock.launchersGroup) { + var launcherActivities = tasksModel.launcherActivities(launcher); + + if (activity !== tasksModel.activity && (launcherActivities[0] === "00000000-0000-0000-0000-000000000000")) { + root.launcherForRemoval = launcher; + } + tasksModel.requestAddLauncherToActivity(launcher, activity); } }