colours: fix switching

Also remove unnecessary clipping rects around dashboard panes

2 files changed, 7 insertions, 27 deletions

diff --git a/modules/dashboard/Content.qml b/modules/dashboard/Content.qml
index b7b48ff..84079ef 100644
--- a/modules/dashboard/Content.qml
+++ b/modules/dashboard/Content.qml
@@ -4,7 +4,6 @@ import "root:/config"
 import Quickshell
 import Quickshell.Widgets
 import QtQuick
-import QtQuick.Controls
 
 Item {
     id: root
@@ -84,35 +83,16 @@ Item {
             Row {
                 id: row
 
-                ClippingWrapperRectangle {
-                    id: dash
-
-                    radius: Appearance.rounding.normal
-                    color: "transparent"
-
-                    Dash {
-                        shouldUpdate: visible && dash === view.currentItem
-                    }
+                Dash {
+                    shouldUpdate: visible && this === view.currentItem
                 }
 
-                ClippingWrapperRectangle {
-                    id: media
-
-                    radius: Appearance.rounding.normal
-                    color: "transparent"
-
-                    Media {
-                        shouldUpdate: visible && media === view.currentItem
-                        visibilities: root.visibilities
-                    }
+                Media {
+                    shouldUpdate: visible && this === view.currentItem
+                    visibilities: root.visibilities
                 }
 
-                ClippingWrapperRectangle {
-                    radius: Appearance.rounding.normal
-                    color: "transparent"
-
-                    Performance {}
-                }
+                Performance {}
             }
 
             Behavior on contentX {
diff --git a/services/Colours.qml b/services/Colours.qml
index aa4282f..4383972 100644
--- a/services/Colours.qml
+++ b/services/Colours.qml
@@ -44,7 +44,7 @@ Singleton {
                 colours[name] = `#${colour.trim()}`;
         }
 
-        if (isPreview && endPreviewOnNextChange) {
+        if (!isPreview || (isPreview && endPreviewOnNextChange)) {
             showPreview = false;
             endPreviewOnNextChange = false;
         }