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 @@ -367,7 +367,7 @@ return model.GenericName; }); toolTipDelegate.virtualDesktopParent = Qt.binding(function() { - return model.VirtualDesktop != undefined ? model.VirtualDesktop : 0; + return (model.VirtualDesktops != undefined || model.VirtualDesktops.length == 0) ? model.VirtualDesktops : [0]; }); toolTipDelegate.isOnAllVirtualDesktopsParent = Qt.binding(function() { return model.IsOnAllVirtualDesktops == true; diff --git a/applets/taskmanager/package/contents/ui/ToolTipDelegate.qml b/applets/taskmanager/package/contents/ui/ToolTipDelegate.qml --- a/applets/taskmanager/package/contents/ui/ToolTipDelegate.qml +++ b/applets/taskmanager/package/contents/ui/ToolTipDelegate.qml @@ -53,7 +53,7 @@ // Needed for generateSubtext() property string displayParent property string genericName - property int virtualDesktopParent + property var virtualDesktopParent property bool isOnAllVirtualDesktopsParent property var activitiesParent // diff --git a/applets/taskmanager/package/contents/ui/ToolTipInstance.qml b/applets/taskmanager/package/contents/ui/ToolTipInstance.qml --- a/applets/taskmanager/package/contents/ui/ToolTipInstance.qml +++ b/applets/taskmanager/package/contents/ui/ToolTipInstance.qml @@ -434,15 +434,18 @@ var subTextEntries = []; - var vd = isGroup ? VirtualDesktop : virtualDesktopParent; + var virtualDesktops = isGroup ? VirtualDesktops : virtualDesktopParent; + var virtualDesktopNameList = new Array(); + + for (var i = 0; i < virtualDesktops.length; ++i) { + virtualDesktopNameList.push(virtualDesktopInfo.desktopNames[virtualDesktops[i] - 1]); + } if (!plasmoid.configuration.showOnlyCurrentDesktop && virtualDesktopInfo.numberOfDesktops > 1 && (isGroup ? IsOnAllVirtualDesktops : isOnAllVirtualDesktopsParent) !== true - && vd != -1 - && vd != undefined - && virtualDesktopInfo.desktopNames[vd - 1] != undefined) { - subTextEntries.push(i18n("On %1", virtualDesktopInfo.desktopNames[vd - 1])); + && virtualDesktops.length > 0) { + subTextEntries.push(i18nc("Comma-separated list of desktops", "On %1", virtualDesktopNameList.join())); } var act = isGroup ? Activities : activitiesParent;