sidebar/notifs: fix clear all button & expand bugs

Disable expand on drag on notifs when expanded (fixes drag expansion bugs and feels better)
Also add scrollbar

2 files changed, 6 insertions, 4 deletions

diff --git a/modules/sidebar/NotifDock.qml b/modules/sidebar/NotifDock.qml
index 6ec8581..588811a 100644
--- a/modules/sidebar/NotifDock.qml
+++ b/modules/sidebar/NotifDock.qml
@@ -98,6 +98,8 @@ Item {
                 values: [...new Set(Notifs.list.filter(n => !n.closed).map(n => n.appName))].reverse()
             }
 
+            StyledScrollBar.vertical: StyledScrollBar {}
+
             delegate: MouseArea {
                 id: notif
 
@@ -218,7 +220,7 @@ Item {
         interval: 50
         onTriggered: {
             if (root.notifCount > 0)
-                Notifs.list[0].close();
+                Notifs.list.find(n => !n.closed).close();
             else
                 stop();
         }
@@ -239,7 +241,7 @@ Item {
             icon: "clear_all"
             radius: Appearance.rounding.normal
             padding: Appearance.padding.normal
-            font.pointSize: Math.round(Appearance.font.size.large * 1.3)
+            font.pointSize: Math.round(Appearance.font.size.large * 1.2)
             onClicked: clearTimer.start()
 
             Elevation {
diff --git a/modules/sidebar/NotifGroupList.qml b/modules/sidebar/NotifGroupList.qml
index 675dc44..3c45b0b 100644
--- a/modules/sidebar/NotifGroupList.qml
+++ b/modules/sidebar/NotifGroupList.qml
@@ -59,7 +59,7 @@ Item {
             hoverEnabled: true
             cursorShape: pressed ? Qt.ClosedHandCursor : undefined
             acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MiddleButton
-            preventStealing: true
+            preventStealing: !root.expanded
 
             drag.target: this
             drag.axis: Drag.XAxis
@@ -72,7 +72,7 @@ Item {
                     modelData.close();
             }
             onPositionChanged: event => {
-                if (pressed) {
+                if (pressed && !root.expanded) {
                     const diffY = event.y - startY;
                     if (Math.abs(diffY) > Config.notifs.expandThreshold)
                         root.requestToggleExpand(diffY > 0);