diff options
Diffstat (limited to 'desktop/island/ClockPill.qml')
| -rw-r--r-- | desktop/island/ClockPill.qml | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/desktop/island/ClockPill.qml b/desktop/island/ClockPill.qml index f1217f1..07a0eb7 100644 --- a/desktop/island/ClockPill.qml +++ b/desktop/island/ClockPill.qml @@ -27,6 +27,12 @@ Capsule { readonly property var entry: flickApp ? DesktopEntries.heuristicLookup(flickApp) : null readonly property string wsIcon: Workspaces.icon(flickWs) + // Resolved paths, not names, decide what shows: a name the icon theme + // lacks resolves to "", and testing the name left a blank slot where the + // workspace number should have been. + readonly property string wsPath: wsIcon ? Quickshell.iconPath(wsIcon, true) : "" + readonly property string appPath: + flickApp ? Quickshell.iconPath(entry?.icon || flickApp, true) : "" restWidth: (flicking ? flickRow.implicitWidth : restRow.implicitWidth) + 28 @@ -73,24 +79,23 @@ Capsule { IconImage { anchors.verticalCenter: parent.verticalCenter - visible: pill.wsIcon !== "" + visible: pill.wsPath !== "" implicitSize: 18 - source: pill.wsIcon ? Quickshell.iconPath(pill.wsIcon, true) : "" + source: pill.wsPath } // A named workspace, or one past eight, has no icon: its number. Text { anchors.verticalCenter: parent.verticalCenter - visible: pill.wsIcon === "" + visible: pill.wsPath === "" text: pill.flickWs font { family: Theme.fontFamily; pixelSize: Theme.fontSize - 1; weight: Font.DemiBold } color: Theme.accent } IconImage { anchors.verticalCenter: parent.verticalCenter - visible: pill.flickApp !== "" + visible: pill.appPath !== "" implicitSize: 18 - source: pill.flickApp - ? Quickshell.iconPath(pill.entry?.icon || pill.flickApp, true) : "" + source: pill.appPath } Text { anchors.verticalCenter: parent.verticalCenter |