diff --git a/applets/taskmanager/package/contents/ui/Task.qml b/applets/taskmanager/package/contents/ui/Task.qml --- a/applets/taskmanager/package/contents/ui/Task.qml +++ b/applets/taskmanager/package/contents/ui/Task.qml @@ -56,6 +56,8 @@ property QtObject smartLauncherItem: null readonly property bool highlighted: (inPopup && activeFocus) || (!inPopup && containsMouse) + || (task.contextMenu && task.contextMenu.status === PlasmaComponents.DialogStatus.Open) + || (groupDialog.visible && groupDialog.visualParent === task) acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MidButton @@ -104,7 +106,8 @@ toolTip.hideToolTip(); } - tasks.createContextMenu(task).show(); + contextMenu = tasks.createContextMenu(task); + contextMenu.show(); } } @@ -344,7 +347,7 @@ anchors.fill: parent - active: task.highlighted || (task.contextMenu && task.contextMenu.status == PlasmaComponents.DialogStatus.Open) + active: task.highlighted enabled: true usesPlasmaTheme: false @@ -430,7 +433,7 @@ }, State { name: "hovered" - when: task.highlighted || (contextMenu.status == PlasmaComponents.DialogStatus.Open && contextMenu.visualParent == task) + when: task.highlighted PropertyChanges { target: frame @@ -448,16 +451,16 @@ }, State { name: "minimized" - when: model.IsMinimized === true && !(groupDialog.visible && groupDialog.visualParent == task) + when: model.IsMinimized === true PropertyChanges { target: frame basePrefix: "minimized" } }, State { name: "active" - when: model.IsActive === true || groupDialog.visible && groupDialog.visualParent == task + when: model.IsActive === true PropertyChanges { target: frame