fix: notification body wraps properly

.pre-commit-config.yaml

@@ -7,7 +7,7 @@ repos:
     rev: v8.18.2
     hooks:
       - id: gitleaks
-        stages: [commit]
+        stages: [pre-commit]
 
   - repo: local
     hooks:
@@ -17,4 +17,4 @@ repos:
         language: system
         files: .*
         exclude: .*\.(png|jpg|jpeg|age)
-        stages: [commit]
+        stages: [pre-commit]

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1729665710,
+        "lastModified": 1727122398,
-        "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=",
+        "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d",
+        "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093",
         "type": "github"
       },
       "original": {
@@ -23,11 +23,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1729288633,
+        "lastModified": 1727391151,
-        "narHash": "sha256-uItuxRuYGoWRwswpdoPIBN8eRzJNl1GbScjvyhjawqo=",
+        "narHash": "sha256-PIEJfHzze4MWwaS7Py+az0IL7A+bZd4pFTE/uAy1b70=",
         "ref": "refs/heads/master",
-        "rev": "1adad9e822a9ac66a962823e7d931639782d3558",
+        "rev": "3ed39b2a798419a168e5c79a2db9f7ee20de70fa",
-        "revCount": 357,
+        "revCount": 352,
         "type": "git",
         "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
       },

src/windows/notificationtoast/Toast.qml

@@ -2,7 +2,6 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 import Quickshell
-import Quickshell.Widgets
 import "root:base"
 import Quickshell.Services.Notifications
 
@@ -19,36 +18,48 @@ MouseArea {
     required property NotificationUrgency urgency
     required property int index
 
+    property var close: () => {
+        toast.parent.parent.model.remove(toast.index, 1);
+    }
+
     hoverEnabled: true
-    height: box.height
+    height: 26
-    width: box.width
+    width: 200
 
     BRectangle {
         id: box
-        height: 26
+        anchors.fill: parent
-        width: 200
 
-        BRectangle {
+        Column {
             anchors.fill: parent
+            anchors.margins: 5
 
-            Column {
+            Row {
-                anchors.fill: parent
+                Layout.fillWidth: true
-                anchors.margins: 5
-                Row {
-                    IconImage {
-                        source: Quickshell.iconPath(toast.appIcon)
-                        height: 16
-                        visible: toast.appIcon
-                    }
 
-                    Text {
+                IconImage {
-                        text: (toast.appIcon ? " " : toast.appName + ": ") + toast.summary
+                    source: Quickshell.iconPath(toast.appIcon)
-                    }
+                    height: 16
+                    visible: toast.appIcon
                 }
+
                 Text {
-                    text: toast.body
+                    text: (toast.appIcon ? " " : toast.appName + ": ") + toast.summary
-                    visible: box.state === "expand"
                 }
+
+                Button {
+                    onClicked: toast.close()
+                    width: 16
+                    height: 16
+                }
+            }
+
+            Text {
+                text: toast.body
+                width: parent.width
+                visible: box.state === "expand"
+                wrapMode: Text.Wrap
+                Layout.fillWidth: true
             }
         }
 
@@ -56,7 +67,7 @@ MouseArea {
             name: "expand"
             when: toast.containsMouse
             PropertyChanges {
-                target: box
+                target: toast
                 width: 250
                 height: 140
             }