From faf7fc6ae8d70968132249700fd80adebb338f65 Mon Sep 17 00:00:00 2001 From: Eriq Taing Date: Thu, 1 Oct 2026 15:09:51 -0400 Subject: [PATCH] Removed parts related to Qt5Comapt due to issues working --- bar/Workspaces.qml | 1 - common/widgets/RippleButton.qml | 47 +++------------------------------ osd/PlayerControl.qml | 18 ------------- 3 files changed, 4 insertions(+), 62 deletions(-) diff --git a/bar/Workspaces.qml b/bar/Workspaces.qml index c85fa0d..cd753c3 100644 --- a/bar/Workspaces.qml +++ b/bar/Workspaces.qml @@ -8,7 +8,6 @@ import Quickshell.Widgets import qs.common import qs.common.functions import qs.common.widgets -import Qt5Compat.GraphicalEffects Item { id: root diff --git a/common/widgets/RippleButton.qml b/common/widgets/RippleButton.qml index 97a543f..99ac526 100644 --- a/common/widgets/RippleButton.qml +++ b/common/widgets/RippleButton.qml @@ -2,7 +2,6 @@ import qs.common import qs.common.widgets import qs.common.functions -import Qt5Compat.GraphicalEffects import QtQuick import QtQuick.Controls @@ -31,8 +30,8 @@ Button { property color colRipple: Appearance?.colors.colLayer1Active ?? "#D6CEE2" property color colRippleToggled: Appearance?.colors.colPrimaryActive ?? "#D6CEE2" - property color buttonColor: root.enabled ? - (root.toggled ? + property color buttonColor: root.enabled ? + (root.toggled ? (root.hovered ? colBackgroundToggledHover : colBackgroundToggled) : (root.hovered ? colBackgroundHover : colBackground)) : colBackground @@ -61,7 +60,7 @@ Button { anchors.fill: parent cursorShape: Qt.PointingHandCursor acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MiddleButton - onPressed: (event) => { + onPressed: (event) => { if(event.button === Qt.RightButton) { if (root.altAction) { root.altAction(); @@ -156,48 +155,10 @@ Button { Behavior on color { animation: Appearance?.animation.elementMoveFast.colorAnimation.createObject(this) } - - layer.enabled: true - layer.effect: OpacityMask { - maskSource: Rectangle { - width: buttonBackground.width - height: buttonBackground.height - radius: root.buttonEffectiveRadius - } - } - - Item { - id: ripple - width: ripple.implicitWidth - height: ripple.implicitHeight - opacity: 0 - visible: width > 0 && height > 0 - - property real implicitWidth: 0 - property real implicitHeight: 0 - - Behavior on opacity { - animation: Appearance?.animation.elementMoveFast.colorAnimation.createObject(this) - } - - RadialGradient { - anchors.fill: parent - gradient: Gradient { - GradientStop { position: 0.0; color: root.rippleColor } - GradientStop { position: 0.3; color: root.rippleColor } - GradientStop { position: 0.5; color: Qt.rgba(root.rippleColor.r, root.rippleColor.g, root.rippleColor.b, 0) } - } - } - - transform: Translate { - x: -ripple.width / 2 - y: -ripple.height / 2 - } - } } contentItem: StyledText { text: root.buttonText color: root.buttonTextColor } -} \ No newline at end of file +} diff --git a/osd/PlayerControl.qml b/osd/PlayerControl.qml index bc875d6..1ccfa72 100644 --- a/osd/PlayerControl.qml +++ b/osd/PlayerControl.qml @@ -7,7 +7,6 @@ import Quickshell.Services.Mpris import qs.common import qs.common.functions import qs.common.widgets -import Qt5Compat.GraphicalEffects Item { // -- fields -- @@ -93,14 +92,6 @@ Item { anchors.margins: Appearance.sizes.elevationMargin color: blendedColors.colLayer0 radius: root.popupRounding - layer.enabled: true - layer.effect: OpacityMask { - maskSource: Rectangle { - width: background.width - height: background.height - radius: background.radius - } - } Image { id: blurredArt anchors.fill: parent @@ -141,15 +132,6 @@ Item { radius: playerController.artRounding color:ColorUtils.transparentize(blendedColors.colLayer1, 0.5) - layer.enabled: true - layer.effect: OpacityMask { - maskSource: Rectangle { - width: artBackground.width - height: artBackground.height - radius: artBackground.radius - } - } - Image { id: mediaArt property int size: parent.height