From 971a511edb22f747ef3bf1ff91ce97bff33daaf7 Mon Sep 17 00:00:00 2001 From: purian23 Date: Sun, 1 Mar 2026 17:37:21 -0500 Subject: [PATCH] fix(notifications): Apply appIdSubs to iconFrImage fallback path - Consistent with the appIcon PR changes in #1880. --- .../Modules/Notifications/Center/HistoryNotificationCard.qml | 2 +- quickshell/Modules/Notifications/Center/NotificationCard.qml | 4 ++-- quickshell/Modules/Notifications/Popup/NotificationPopup.qml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/quickshell/Modules/Notifications/Center/HistoryNotificationCard.qml b/quickshell/Modules/Notifications/Center/HistoryNotificationCard.qml index ce6f527d..5e033e52 100644 --- a/quickshell/Modules/Notifications/Center/HistoryNotificationCard.qml +++ b/quickshell/Modules/Notifications/Center/HistoryNotificationCard.qml @@ -137,7 +137,7 @@ Rectangle { return ""; const appIcon = historyItem.appIcon; if (!appIcon) - return iconFromImage ? "image://icon/" + iconFromImage : ""; + return iconFromImage ? Paths.resolveIconUrl(iconFromImage) : ""; if (appIcon.startsWith("file://") || appIcon.startsWith("http://") || appIcon.startsWith("https://") || appIcon.includes("/")) return appIcon; if (appIcon.startsWith("material:") || appIcon.startsWith("svg:") || appIcon.startsWith("unicode:") || appIcon.startsWith("image:")) diff --git a/quickshell/Modules/Notifications/Center/NotificationCard.qml b/quickshell/Modules/Notifications/Center/NotificationCard.qml index 7f0c7ead..1838f10a 100644 --- a/quickshell/Modules/Notifications/Center/NotificationCard.qml +++ b/quickshell/Modules/Notifications/Center/NotificationCard.qml @@ -215,7 +215,7 @@ Rectangle { return ""; const appIcon = notificationGroup?.latestNotification?.appIcon; if (!appIcon) - return iconFromImage ? "image://icon/" + iconFromImage : ""; + return iconFromImage ? Paths.resolveIconUrl(iconFromImage) : ""; if (appIcon.startsWith("file://") || appIcon.startsWith("http://") || appIcon.startsWith("https://") || appIcon.includes("/")) return appIcon; if (appIcon.startsWith("material:") || appIcon.startsWith("svg:") || appIcon.startsWith("unicode:") || appIcon.startsWith("image:")) @@ -552,7 +552,7 @@ Rectangle { return ""; const appIcon = modelData?.appIcon; if (!appIcon) - return iconFromImage ? "image://icon/" + iconFromImage : ""; + return iconFromImage ? Paths.resolveIconUrl(iconFromImage) : ""; if (appIcon.startsWith("file://") || appIcon.startsWith("http://") || appIcon.startsWith("https://") || appIcon.includes("/")) return appIcon; if (appIcon.startsWith("material:") || appIcon.startsWith("svg:") || appIcon.startsWith("unicode:") || appIcon.startsWith("image:")) diff --git a/quickshell/Modules/Notifications/Popup/NotificationPopup.qml b/quickshell/Modules/Notifications/Popup/NotificationPopup.qml index d30f00dd..823106f1 100644 --- a/quickshell/Modules/Notifications/Popup/NotificationPopup.qml +++ b/quickshell/Modules/Notifications/Popup/NotificationPopup.qml @@ -519,7 +519,7 @@ PanelWindow { return ""; const appIcon = notificationData.appIcon; if (!appIcon) - return iconFromImage ? "image://icon/" + iconFromImage : ""; + return iconFromImage ? Paths.resolveIconUrl(iconFromImage) : ""; if (appIcon.startsWith("file://") || appIcon.startsWith("http://") || appIcon.startsWith("https://") || appIcon.includes("/")) return appIcon; if (appIcon.startsWith("material:") || appIcon.startsWith("svg:") || appIcon.startsWith("unicode:") || appIcon.startsWith("image:"))