From d01194d1fcc4f4eedb49b320613634e7a46722bf Mon Sep 17 00:00:00 2001
From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com>
Date: Sat, 3 May 2025 15:05:39 +1000
Subject: feat: use multieffect instead of qt5compat

Also use loader for tray icon recolouring
---
 modules/bar/components/workspaces/ActiveIndicator.qml | 7 +++++--
 modules/bar/components/workspaces/Workspaces.qml      | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'modules/bar/components/workspaces')

diff --git a/modules/bar/components/workspaces/ActiveIndicator.qml b/modules/bar/components/workspaces/ActiveIndicator.qml
index 54f10fa..196b9e5 100644
--- a/modules/bar/components/workspaces/ActiveIndicator.qml
+++ b/modules/bar/components/workspaces/ActiveIndicator.qml
@@ -2,7 +2,7 @@ import "root:/widgets"
 import "root:/services"
 import "root:/config"
 import QtQuick
-import Qt5Compat.GraphicalEffects
+import QtQuick.Effects
 
 Rectangle {
     id: root
@@ -44,9 +44,12 @@ Rectangle {
         }
     }
 
-    OpacityMask {
+    MultiEffect {
         source: base
         maskSource: root.mask
+        maskEnabled: true
+        maskSpreadAtMin: 1
+        maskThresholdMin: 0.4
 
         x: root.vertical ? 0 : -parent.offset
         y: root.vertical ? -parent.offset : 0
diff --git a/modules/bar/components/workspaces/Workspaces.qml b/modules/bar/components/workspaces/Workspaces.qml
index 0d9817a..a5ae316 100644
--- a/modules/bar/components/workspaces/Workspaces.qml
+++ b/modules/bar/components/workspaces/Workspaces.qml
@@ -25,6 +25,7 @@ Item {
         id: layout
 
         spacing: 0
+        layer.enabled: true
 
         Repeater {
             model: BarConfig.workspaces.shown
-- 
cgit v1.2.3-freya