diff --git a/applets/kicker/package/contents/code/tools.js b/applets/kicker/package/contents/code/tools.js --- a/applets/kicker/package/contents/code/tools.js +++ b/applets/kicker/package/contents/code/tools.js @@ -164,8 +164,6 @@ var closeRequested = model.trigger(index, actionId, actionArgument); if (closeRequested) { - plasmoid.expanded = false; - return true; } diff --git a/applets/kicker/package/contents/ui/DashboardRepresentation.qml b/applets/kicker/package/contents/ui/DashboardRepresentation.qml --- a/applets/kicker/package/contents/ui/DashboardRepresentation.qml +++ b/applets/kicker/package/contents/ui/DashboardRepresentation.qml @@ -911,7 +911,9 @@ } onActionTriggered: { - Tools.triggerAction(ListView.view.model, model.index, actionId, actionArgument); + if (Tools.triggerAction(ListView.view.model, model.index, actionId, actionArgument) === true) { + plasmoid.expanded = false; + } } function openActionMenu(visualParent, x, y) { diff --git a/applets/kicker/package/contents/ui/ItemGridDelegate.qml b/applets/kicker/package/contents/ui/ItemGridDelegate.qml --- a/applets/kicker/package/contents/ui/ItemGridDelegate.qml +++ b/applets/kicker/package/contents/ui/ItemGridDelegate.qml @@ -51,7 +51,7 @@ } function actionTriggered(actionId, actionArgument) { - var close = Tools.triggerAction(GridView.view.model, model.index, actionId, actionArgument); + var close = (Tools.triggerAction(GridView.view.model, model.index, actionId, actionArgument) === true); if (close) { root.toggle(); diff --git a/applets/kicker/package/contents/ui/ItemListDelegate.qml b/applets/kicker/package/contents/ui/ItemListDelegate.qml --- a/applets/kicker/package/contents/ui/ItemListDelegate.qml +++ b/applets/kicker/package/contents/ui/ItemListDelegate.qml @@ -57,7 +57,9 @@ } onActionTriggered: { - Tools.triggerAction(ListView.view.model, model.index, actionId, actionArgument); + if (Tools.triggerAction(ListView.view.model, model.index, actionId, actionArgument) === true) { + plasmoid.expanded = false; + } } function openActionMenu(visualParent, x, y) { diff --git a/applets/kicker/package/contents/ui/SideBarItem.qml b/applets/kicker/package/contents/ui/SideBarItem.qml --- a/applets/kicker/package/contents/ui/SideBarItem.qml +++ b/applets/kicker/package/contents/ui/SideBarItem.qml @@ -43,7 +43,9 @@ } onActionTriggered: { - Tools.triggerAction(repeater.model, model.index, actionId, actionArgument); + if (Tools.triggerAction(repeater.model, model.index, actionId, actionArgument) === true) { + plasmoid.expanded = false; + } } function openActionMenu(visualParent, x, y) { diff --git a/applets/kickoff/package/contents/code/tools.js b/applets/kickoff/package/contents/code/tools.js --- a/applets/kickoff/package/contents/code/tools.js +++ b/applets/kickoff/package/contents/code/tools.js @@ -164,8 +164,6 @@ var closeRequested = model.trigger(index, actionId, actionArgument); if (closeRequested) { - plasmoid.expanded = false; - return true; } diff --git a/applets/kickoff/package/contents/ui/KickoffItem.qml b/applets/kickoff/package/contents/ui/KickoffItem.qml --- a/applets/kickoff/package/contents/ui/KickoffItem.qml +++ b/applets/kickoff/package/contents/ui/KickoffItem.qml @@ -53,7 +53,9 @@ } onActionTriggered: { - Tools.triggerAction(ListView.view.model, model.index, actionId, actionArgument); + if (Tools.triggerAction(ListView.view.model, model.index, actionId, actionArgument) === true) { + plasmoid.expanded = false; + } if (actionId.indexOf("_kicker_favorite_") === 0) { switchToInitial();