Merge branch 'main' into all-tooltips

.config/quickshell/ii/modules/common/widgets/ButtonGroup.qml

@@ -10,6 +10,7 @@ import QtQuick.Layouts
 Rectangle {
     id: root
     default property alias data: rowLayout.data
+    property alias uniformCellSizes: rowLayout.uniformCellSizes
     property real spacing: 5
     property real padding: 0
     property int clickIndex: rowLayout.clickIndex

.config/quickshell/ii/modules/common/widgets/NotificationActionButton.qml

@@ -12,9 +12,9 @@ RippleButton {
     leftPadding: 15
     rightPadding: 15
     buttonRadius: Appearance.rounding.small
-    colBackground: (urgency == NotificationUrgency.Critical) ? Appearance.colors.colSecondaryContainer : Appearance.colors.colSurfaceContainerHighest
-    colBackgroundHover: (urgency == NotificationUrgency.Critical) ? Appearance.colors.colSecondaryContainerHover : Appearance.colors.colSurfaceContainerHighestHover
-    colRipple: (urgency == NotificationUrgency.Critical) ? Appearance.colors.colSecondaryContainerActive : Appearance.colors.colSurfaceContainerHighestActive
+    colBackground: (urgency == NotificationUrgency.Critical) ? Appearance.colors.colSecondaryContainer : Appearance.colors.colLayer4
+    colBackgroundHover: (urgency == NotificationUrgency.Critical) ? Appearance.colors.colSecondaryContainerHover : Appearance.colors.colLayer4Hover
+    colRipple: (urgency == NotificationUrgency.Critical) ? Appearance.colors.colSecondaryContainerActive : Appearance.colors.colLayer4Active
 
     contentItem: StyledText {
         horizontalAlignment: Text.AlignHCenter

.config/quickshell/ii/modules/common/widgets/NotificationAppIcon.qml

@@ -13,9 +13,9 @@ Rectangle { // App icon
     property var urgency: NotificationUrgency.Normal
     property var image: ""
     property real scale: 1
-    property real size: 45 * scale
+    property real size: 38 * scale
     property real materialIconScale: 0.57
-    property real appIconScale: 0.7
+    property real appIconScale: 0.8
     property real smallAppIconScale: 0.49
     property real materialIconSize: size * materialIconScale
     property real appIconSize: size * appIconScale

.config/quickshell/ii/modules/common/widgets/NotificationGroup.qml

@@ -105,7 +105,7 @@ Item { // Notification group area
         id: background
         anchors.left: parent.left
         width: parent.width
-        color: Appearance.colors.colSurfaceContainer
+        color: Appearance.colors.colLayer2
         radius: Appearance.rounding.normal
         anchors.leftMargin: root.xOffset
 

.config/quickshell/ii/modules/common/widgets/NotificationItem.qml

@@ -140,8 +140,8 @@ Item { // Notification item area
         color: (expanded && !onlyNotification) ? 
             (notificationObject.urgency == NotificationUrgency.Critical) ? 
                 ColorUtils.mix(Appearance.colors.colSecondaryContainer, Appearance.colors.colLayer2, 0.35) :
-                (Appearance.colors.colSurfaceContainerHigh) :
-            ColorUtils.transparentize(Appearance.colors.colSurfaceContainerHighest)
+                (Appearance.colors.colLayer3) :
+            ColorUtils.transparentize(Appearance.colors.colLayer3)
 
         implicitHeight: expanded ? (contentColumn.implicitHeight + padding * 2) : summaryRow.implicitHeight
         Behavior on implicitHeight {
@@ -168,7 +168,7 @@ Item { // Notification item area
                     id: summaryText
                     visible: !root.onlyNotification
                     font.pixelSize: root.fontSize
-                    color: Appearance.colors.colOnLayer2
+                    color: Appearance.colors.colOnLayer3
                     elide: Text.ElideRight
                     text: root.notificationObject.summary || ""
                 }

.config/quickshell/ii/modules/common/widgets/PrimaryTabButton.qml

@@ -53,6 +53,7 @@ TabButton {
 
     RippleAnim {
         id: rippleFadeAnim
+        duration: rippleDuration * 2
         target: ripple
         property: "opacity"
         to: 0

.config/quickshell/ii/modules/common/widgets/RippleButton.qml

@@ -29,6 +29,7 @@ Button {
     property color colRipple: Appearance?.colors.colLayer1Active ?? "#D6CEE2"
     property color colRippleToggled: Appearance?.colors.colPrimaryActive ?? "#D6CEE2"
 
+    opacity: root.enabled ? 1 : 0.4
     property color buttonColor: root.enabled ? (root.toggled ? 
         (root.hovered ? colBackgroundToggledHover : 
             colBackgroundToggled) :
@@ -91,6 +92,7 @@ Button {
 
     RippleAnim {
         id: rippleFadeAnim
+        duration: rippleDuration * 2
         target: ripple
         property: "opacity"
         to: 0

.config/quickshell/ii/modules/common/widgets/SecondaryTabButton.qml

@@ -51,6 +51,7 @@ TabButton {
 
     RippleAnim {
         id: rippleFadeAnim
+        duration: rippleDuration * 2
         target: ripple
         property: "opacity"
         to: 0
@@ -106,13 +107,29 @@ TabButton {
             animation: Appearance.animation.elementMoveFast.colorAnimation.createObject(this)
         }
 
-        Rectangle {
+        Item {
             id: ripple
-
-            radius: Appearance.rounding.full
-            color: root.colRipple
+            width: ripple.implicitWidth
+            height: ripple.implicitHeight
             opacity: 0
 
+            property real implicitWidth: 0
+            property real implicitHeight: 0
+            visible: width > 0 && height > 0
+
+            Behavior on opacity {
+                animation: Appearance?.animation.elementMoveFast.colorAnimation.createObject(this)
+            }
+
+            RadialGradient {
+                anchors.fill: parent
+                gradient: Gradient {
+                    GradientStop { position: 0.0; color: root.colRipple }
+                    GradientStop { position: 0.3; color: root.colRipple }
+                    GradientStop { position: 0.5 ; color: Qt.rgba(root.colRipple.r, root.colRipple.g, root.colRipple.b, 0) }
+                }
+            }
+
             transform: Translate {
                 x: -ripple.width / 2
                 y: -ripple.height / 2

.config/quickshell/ii/modules/common/widgets/SelectionDialog.qml

@@ -63,7 +63,7 @@ Item {
                 Layout.rightMargin: dialogPadding
             }
 
-            ListView {
+            StyledListView {
                 id: choiceListView
                 Layout.fillWidth: true
                 Layout.fillHeight: true
@@ -71,9 +71,6 @@ Item {
                 currentIndex: root.defaultChoice !== undefined ? root.items.indexOf(root.defaultChoice) : -1
                 spacing: 6
 
-                maximumFlickVelocity: 3500
-                boundsBehavior: Flickable.DragOverBounds
-
                 model: ScriptModel {
                     id: choiceModel
                 }

.config/quickshell/ii/modules/common/widgets/StyledFlickable.qml

@@ -1,6 +1,50 @@
 import QtQuick
+import qs.modules.common
 
 Flickable {
+    id: root
     maximumFlickVelocity: 3500
     boundsBehavior: Flickable.DragOverBounds
+
+    property real touchpadScrollFactor: Config?.options.interactions.scrolling.touchpadScrollFactor ?? 100
+    property real mouseScrollFactor: Config?.options.interactions.scrolling.mouseScrollFactor ?? 50
+    property real mouseScrollDeltaThreshold: Config?.options.interactions.scrolling.mouseScrollDeltaThreshold ?? 120
+    // Accumulated scroll destination so wheel deltas stack while animating
+    property real scrollTargetY: 0
+
+    MouseArea {
+        visible: Config?.options.interactions.scrolling.fasterTouchpadScroll
+        anchors.fill: parent
+        acceptedButtons: Qt.NoButton
+        onWheel: function(wheelEvent) {
+            const delta = wheelEvent.angleDelta.y / root.mouseScrollDeltaThreshold;
+            // The angleDelta.y of a touchpad is usually small and continuous,
+            // while that of a mouse wheel is typically in multiples of ±120.
+            var scrollFactor = Math.abs(wheelEvent.angleDelta.y) >= root.mouseScrollDeltaThreshold ? root.mouseScrollFactor : root.touchpadScrollFactor;
+
+            const maxY = Math.max(0, root.contentHeight - root.height);
+            const base = scrollAnim.running ? root.scrollTargetY : root.contentY;
+            var targetY = Math.max(0, Math.min(base - delta * scrollFactor, maxY));
+
+            root.scrollTargetY = targetY;
+            root.contentY = targetY;
+            wheelEvent.accepted = true;
+        }
+    }
+
+    Behavior on contentY {
+        NumberAnimation {
+            id: scrollAnim
+            duration: Appearance.animation.scroll.duration
+            easing.type: Appearance.animation.scroll.type
+            easing.bezierCurve: Appearance.animation.scroll.bezierCurve
+        }
+    }
+
+    // Keep target synced when not animating (e.g., drag/flick or programmatic changes)
+    onContentYChanged: {
+        if (!scrollAnim.running) {
+            root.scrollTargetY = root.contentY;
+        }
+    }
 }

.config/quickshell/ii/modules/common/widgets/StyledListView.qml

@@ -14,6 +14,12 @@ ListView {
     property int dragIndex: -1
     property real dragDistance: 0
     property bool popin: true
+    // Accumulated scroll destination so wheel deltas stack while animating
+    property real scrollTargetY: 0
+
+    property real touchpadScrollFactor: Config?.options.interactions.scrolling.touchpadScrollFactor ?? 100
+    property real mouseScrollFactor: Config?.options.interactions.scrolling.mouseScrollFactor ?? 50
+    property real mouseScrollDeltaThreshold: Config?.options.interactions.scrolling.mouseScrollDeltaThreshold ?? 120
 
     function resetDrag() {
         root.dragIndex = -1
@@ -23,6 +29,42 @@ ListView {
     maximumFlickVelocity: 3500
     boundsBehavior: Flickable.DragOverBounds
 
+    MouseArea {
+        visible: Config?.options.interactions.scrolling.fasterTouchpadScroll
+        anchors.fill: parent
+        acceptedButtons: Qt.NoButton
+        onWheel: function(wheelEvent) {
+            const delta = wheelEvent.angleDelta.y / root.mouseScrollDeltaThreshold;
+            // The angleDelta.y of a touchpad is usually small and continuous,
+            // while that of a mouse wheel is typically in multiples of ±120.
+            var scrollFactor = Math.abs(wheelEvent.angleDelta.y) >= root.mouseScrollDeltaThreshold ? root.mouseScrollFactor : root.touchpadScrollFactor;
+
+            const maxY = Math.max(0, root.contentHeight - root.height);
+            const base = scrollAnim.running ? root.scrollTargetY : root.contentY;
+            var targetY = Math.max(0, Math.min(base - delta * scrollFactor, maxY));
+
+            root.scrollTargetY = targetY;
+            root.contentY = targetY;
+            wheelEvent.accepted = true;
+        }
+    }
+
+    Behavior on contentY {
+        NumberAnimation {
+            id: scrollAnim
+            duration: Appearance.animation.scroll.duration
+            easing.type: Appearance.animation.scroll.type
+            easing.bezierCurve: Appearance.animation.scroll.bezierCurve
+        }
+    }
+
+    // Keep target synced when not animating (e.g., drag/flick or programmatic changes)
+    onContentYChanged: {
+        if (!scrollAnim.running) {
+            root.scrollTargetY = root.contentY;
+        }
+    }
+
     add: Transition {
         animations: [
             Appearance?.animation.elementMove.numberAnimation.createObject(this, {