Commit 9bed162d authored by Lewis Lakerink's avatar Lewis Lakerink Committed by David Edmundson
Browse files

[applets/taskmanager] Fix desktop name under wayland when using multiple virtual desktops

parent 34ff3501
...@@ -379,14 +379,17 @@ ColumnLayout { ...@@ -379,14 +379,17 @@ ColumnLayout {
var virtualDesktopNameList = new Array(); var virtualDesktopNameList = new Array();
for (var i = 0; i < virtualDesktops.length; ++i) { for (var i = 0; i < virtualDesktops.length; ++i) {
virtualDesktopNameList.push(virtualDesktopInfo.desktopNames[virtualDesktops[i] - 1]); virtualDesktopNameList.push(virtualDesktopInfo.desktopNames[virtualDesktopInfo.desktopIds.indexOf(virtualDesktops[i])]);
} }
if (!plasmoid.configuration.showOnlyCurrentDesktop var onAllDesktops = (isGroup ? IsOnAllVirtualDesktops : isOnAllVirtualDesktopsParent) === true;
&& virtualDesktopInfo.numberOfDesktops > 1 if (!plasmoid.configuration.showOnlyCurrentDesktop && virtualDesktopInfo.numberOfDesktops > 1) {
&& (isGroup ? IsOnAllVirtualDesktops : isOnAllVirtualDesktopsParent) !== true if (!onAllDesktops && virtualDesktops.length > 0) {
&& virtualDesktops.length > 0) { subTextEntries.push(i18nc("Comma-separated list of desktops", "On %1",
subTextEntries.push(i18nc("Comma-separated list of desktops", "On %1", virtualDesktopNameList.join())); virtualDesktopNameList.join(", ")));
} else if (onAllDesktops) {
subTextEntries.push(i18nc("Comma-separated list of desktops", "Pinned to all desktops"));
}
} }
var act = isGroup ? Activities : activitiesParent; var act = isGroup ? Activities : activitiesParent;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment