internal: better shadow

6 files changed, 20 insertions, 33 deletions

diff --git a/modules/dashboard/Media.qml b/modules/dashboard/Media.qml
index 95e412b..25364f6 100644
--- a/modules/dashboard/Media.qml
+++ b/modules/dashboard/Media.qml
@@ -9,7 +9,6 @@ import Quickshell.Widgets
 import Quickshell.Services.Mpris
 import QtQuick
 import QtQuick.Controls
-import QtQuick.Effects
 import QtQuick.Layouts
 import QtQuick.Shapes
 
@@ -425,13 +424,11 @@ Item {
                     }
                 }
 
-                RectangularShadow {
+                Elevation {
                     anchors.fill: playerSelectorBg
                     radius: playerSelectorBg.radius
-                    color: Qt.alpha(Colours.palette.m3shadow, 0.7)
                     opacity: playerSelector.expanded ? 1 : 0
-                    blur: 5
-                    spread: 0
+                    level: 2
 
                     Behavior on opacity {
                         Anim {
diff --git a/modules/detachedcontent/bluetooth/Details.qml b/modules/detachedcontent/bluetooth/Details.qml
index 6ca611e..f0ebb0b 100644
--- a/modules/detachedcontent/bluetooth/Details.qml
+++ b/modules/detachedcontent/bluetooth/Details.qml
@@ -304,10 +304,6 @@ Item {
                 font.pointSize: Appearance.font.size.large
                 fill: 1
             }
-
-            Behavior on radius {
-                Anim {}
-            }
         }
     }
 
diff --git a/modules/detachedcontent/bluetooth/Settings.qml b/modules/detachedcontent/bluetooth/Settings.qml
index de5e6e7..b6f6ca1 100644
--- a/modules/detachedcontent/bluetooth/Settings.qml
+++ b/modules/detachedcontent/bluetooth/Settings.qml
@@ -7,7 +7,6 @@ import qs.config
 import Quickshell.Bluetooth
 import QtQuick
 import QtQuick.Layouts
-import QtQuick.Effects
 
 ColumnLayout {
     id: root
@@ -154,14 +153,12 @@ ColumnLayout {
                         }
                     }
 
-                    RectangularShadow {
+                    Elevation {
                         anchors.fill: adapterListBg
                         radius: adapterListBg.radius
-                        color: Qt.alpha(Colours.palette.m3shadow, 0.7)
                         opacity: adapterPickerButton.expanded ? 1 : 0
                         scale: adapterPickerButton.expanded ? 1 : 0.7
-                        blur: 5
-                        spread: 0
+                        level: 2
 
                         Behavior on opacity {
                             Anim {}
diff --git a/modules/launcher/items/WallpaperItem.qml b/modules/launcher/items/WallpaperItem.qml
index e3d84d4..401e852 100644
--- a/modules/launcher/items/WallpaperItem.qml
+++ b/modules/launcher/items/WallpaperItem.qml
@@ -4,7 +4,6 @@ import qs.config
 import Quickshell
 import Quickshell.Widgets
 import QtQuick
-import QtQuick.Effects
 
 StyledRect {
     id: root
@@ -33,13 +32,11 @@ StyledRect {
         }
     }
 
-    RectangularShadow {
-        opacity: root.PathView.isCurrentItem ? 0.7 : 0
+    Elevation {
         anchors.fill: image
         radius: image.radius
-        color: Colours.palette.m3shadow
-        blur: 10
-        spread: 3
+        opacity: root.PathView.isCurrentItem ? 1 : 0
+        level: 4
 
         Behavior on opacity {
             Anim {}
diff --git a/widgets/ExtraIndicator.qml b/widgets/ExtraIndicator.qml
index 448af23..fd6f6ee 100644
--- a/widgets/ExtraIndicator.qml
+++ b/widgets/ExtraIndicator.qml
@@ -1,7 +1,6 @@
 import qs.services
 import qs.config
 import QtQuick
-import QtQuick.Effects
 
 StyledRect {
     required property int extra
@@ -15,16 +14,17 @@ StyledRect {
     implicitWidth: count.implicitWidth + Appearance.padding.normal * 2
     implicitHeight: count.implicitHeight + Appearance.padding.small * 2
 
-    layer.enabled: opacity > 0
-    layer.effect: MultiEffect {
-        shadowEnabled: true
-        blurMax: 10
-        shadowColor: Colours.palette.m3shadow
-    }
-
     opacity: extra > 0 ? 1 : 0
     scale: extra > 0 ? 1 : 0.5
 
+    Elevation {
+        anchors.fill: parent
+        radius: parent.radius
+        opacity: parent.opacity
+        z: -1
+        level: 2
+    }
+
     StyledText {
         id: count
 
diff --git a/widgets/VerticalSlider.qml b/widgets/VerticalSlider.qml
index 21bdc7a..9b55a0d 100644
--- a/widgets/VerticalSlider.qml
+++ b/widgets/VerticalSlider.qml
@@ -3,7 +3,6 @@ import qs.services
 import qs.config
 import QtQuick
 import QtQuick.Controls
-import QtQuick.Effects
 
 Slider {
     id: root
@@ -38,12 +37,10 @@ Slider {
         implicitWidth: root.width
         implicitHeight: root.width
 
-        RectangularShadow {
+        Elevation {
             anchors.fill: parent
             radius: rect.radius
-            color: Colours.palette.m3shadow
-            blur: 5
-            spread: 0
+            level: handleInteraction.containsMouse ? 2 : 1
         }
 
         StyledRect {
@@ -55,7 +52,10 @@ Slider {
             radius: Appearance.rounding.full
 
             MouseArea {
+                id: handleInteraction
+
                 anchors.fill: parent
+                hoverEnabled: true
                 cursorShape: Qt.PointingHandCursor
                 acceptedButtons: Qt.NoButton
             }