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
v0.7
Michail Vourlakos
parent 39b3f72f75
commit 5bd4bbe188

@ -688,6 +688,10 @@ PlasmaComponents.ContextMenu {
if (latteDock && latteDock.launchersGroup >= Latte.Dock.LayoutLaunchers) { if (latteDock && latteDock.launchersGroup >= Latte.Dock.LayoutLaunchers) {
latteDock.universalLayoutManager.launchersSignals.addLauncherToActivity(latteDock.launchersGroup, url, id); latteDock.universalLayoutManager.launchersSignals.addLauncherToActivity(latteDock.launchersGroup, url, id);
} else { } else {
if (id !== tasksModel.activity && (activities[0] === "00000000-0000-0000-0000-000000000000")) {
root.launcherForRemoval = url;
}
tasksModel.requestAddLauncherToActivity(url, id); tasksModel.requestAddLauncherToActivity(url, id);
} }
} else { } else {

@ -1361,6 +1361,12 @@ Item {
function extSignalAddLauncherToActivity(group, launcher, activity) { function extSignalAddLauncherToActivity(group, launcher, activity) {
if (group === latteDock.launchersGroup) { 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); tasksModel.requestAddLauncherToActivity(launcher, activity);
} }
} }

Loading…
Cancel
Save