modules/bar/components/notifications/NotificationItem.qml

@@ -1,40 +0,0 @@
-pragma ComponentBehavior: Bound
-
-import qs.widgets
-import QtQuick
-import QtQuick.Layouts
-import Quickshell
-import Quickshell.Widgets
-
-StyledLabel {
-    id: root
-
-    required property var modelData
-
-    margin: 16
-    anchors.left: parent.left
-    anchors.right: parent.right
-
-    RowLayout {
-        ClippingRectangle {
-            implicitWidth: icon.implicitSize
-            implicitHeight: icon.implicitSize
-            IconImage {
-                id: icon
-                implicitSize: 20
-                source: root.modelData.image == "" ? Quickshell.iconPath(root.modelData.appIcon, "device-support-unknown-symbolic") : root.modelData.image
-            }
-        }
-        ColumnLayout {
-
-            StyledText {
-                font.bold: true
-                font.pixelSize: 12
-                text: root.modelData.summary ?? root.modelData.appName
-            }
-            StyledText {
-                text: root.modelData.body
-            }
-        }
-    }
-}

modules/bar/components/notifications/NotificationMenu.qml

@@ -61,7 +61,34 @@ StyledPopupWindow {
                     }
                 }
                 model: Notifications.list
-                delegate: NotificationItem {}
+                delegate: StyledLabel {
+                    required property var modelData
+                    margin: 16
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    RowLayout {
+                        ClippingRectangle {
+                            implicitWidth: icon.implicitSize
+                            implicitHeight: icon.implicitSize
+                            IconImage {
+                                id: icon
+                                implicitSize: 20
+                                source: modelData.image == "" ? Quickshell.iconPath(modelData.appIcon, "device-support-unknown-symbolic") : modelData.image
+                            }
+                        }
+                        ColumnLayout {
+
+                            StyledText {
+                                font.bold: true
+                                font.pixelSize: 12
+                                text: modelData.summary ?? modelData.appName
+                            }
+                            StyledText {
+                                text: modelData.body
+                            }
+                        }
+                    }
+                }
             }
         }
     }

services/Notifications.qml

@@ -1,6 +1,5 @@
 pragma Singleton
 
-import QtQuick
 import Quickshell
 import Quickshell.Services.Notifications
 
@@ -32,14 +31,9 @@ Singleton {
             if (!root.enabled) {
                 return;
             }
-
-            if (event == null) {
-                console.log("Event is null?");
-                return;
-            }
-
             event.tracked = true;
-            root.list = root.list.filter(item => item != null && item.id != event.id).push(event);
+            root.list = root.list.filter(item => item.id != event.id);
+            root.list.push(event);
         }
     }
 }