diff options
| -rw-r--r-- | modules/bar/components/TrayItem.qml | 27 | ||||
| -rw-r--r-- | modules/bar/components/workspaces/ActiveIndicator.qml | 7 | ||||
| -rw-r--r-- | modules/bar/components/workspaces/Workspaces.qml | 1 |
3 files changed, 23 insertions, 12 deletions
diff --git a/modules/bar/components/TrayItem.qml b/modules/bar/components/TrayItem.qml index 1d418dc..b7ffdec 100644 --- a/modules/bar/components/TrayItem.qml +++ b/modules/bar/components/TrayItem.qml @@ -1,9 +1,11 @@ +pragma ComponentBehavior: Bound + import "root:/config" import Quickshell import Quickshell.Widgets import Quickshell.Services.SystemTray import QtQuick -import Qt5Compat.GraphicalEffects +import QtQuick.Effects MouseArea { id: root @@ -46,17 +48,22 @@ MouseArea { anchors.fill: parent } - ColorOverlay { - visible: BarConfig.tray.recolourIcons + Loader { anchors.fill: icon - source: icon - color: root.colour + active: BarConfig.tray.recolourIcons + asynchronous: true + + sourceComponent: MultiEffect { + source: icon + colorizationColor: root.colour + colorization: 1 - Behavior on color { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard + Behavior on colorizationColor { + ColorAnimation { + duration: Appearance.anim.durations.normal + easing.type: Easing.BezierSpline + easing.bezierCurve: Appearance.anim.curves.standard + } } } } 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 |