diff --git a/modules/bar/popouts/ActiveWindow.qml b/modules/bar/popouts/ActiveWindow.qml index a8afc95..574d29d 100644 --- a/modules/bar/popouts/ActiveWindow.qml +++ b/modules/bar/popouts/ActiveWindow.qml @@ -127,7 +127,7 @@ Item { Layout.alignment: Qt.AlignVCenter implicitSize: 36 - source: Icons.getAppIcon(toplevel?.lastIpcObject.class ?? "", "") + source: Icons.getAppIcon(toplevel?.lastIpcObject.class ?? "") } ColumnLayout { diff --git a/modules/dashboard/Mixer.qml b/modules/dashboard/Mixer.qml index a83ae58..397298b 100644 --- a/modules/dashboard/Mixer.qml +++ b/modules/dashboard/Mixer.qml @@ -110,8 +110,8 @@ Item { source: { const icon = entry.modelData.properties["application.icon-name"]; if (icon) - return Icons.getAppIcon(icon, "icon-missing"); - Icons.getAppIcon(entry.modelData.name, "icon-missing") + return Icons.getAppIcon(icon); + Icons.getAppIcon(entry.modelData?.name ?? "") } } diff --git a/modules/dashboard/Workspaces.qml b/modules/dashboard/Workspaces.qml index 6f5db42..9aa8c63 100644 --- a/modules/dashboard/Workspaces.qml +++ b/modules/dashboard/Workspaces.qml @@ -377,7 +377,7 @@ Item { anchors.centerIn: parent implicitSize: Math.min(48, window.width * 0.5, window.height * 0.5) - source: Icons.getAppIcon(window.ipc?.class ?? "", "") + source: Icons.getAppIcon(window.ipc?.class ?? "") } // Interactions diff --git a/util/Icons.qml b/util/Icons.qml index 8cbacb0..9f4d6fe 100644 --- a/util/Icons.qml +++ b/util/Icons.qml @@ -139,8 +139,8 @@ Singleton { return DesktopEntries.applications.values.find(a => names.includes(a.id.toLowerCase())) ?? null; } - function getAppIcon(name: string, fallback: string): string { - return Quickshell.iconPath(getDesktopEntry(name)?.icon, fallback); + function getAppIcon(name: string): string { + return Quickshell.iconPath(getDesktopEntry(name)?.icon, "icon-missing"); } function getAppCategoryIcon(name: string, fallback: string): string {