Removed parts related to Qt5Comapt due to issues working

This commit is contained in:
Eriq Taing
2026-10-01 15:09:51 -04:00
parent 7161783d15
commit faf7fc6ae8
3 changed files with 4 additions and 62 deletions
-1
View File
@@ -8,7 +8,6 @@ import Quickshell.Widgets
import qs.common import qs.common
import qs.common.functions import qs.common.functions
import qs.common.widgets import qs.common.widgets
import Qt5Compat.GraphicalEffects
Item { Item {
id: root id: root
+4 -43
View File
@@ -2,7 +2,6 @@
import qs.common import qs.common
import qs.common.widgets import qs.common.widgets
import qs.common.functions import qs.common.functions
import Qt5Compat.GraphicalEffects
import QtQuick import QtQuick
import QtQuick.Controls import QtQuick.Controls
@@ -31,8 +30,8 @@ Button {
property color colRipple: Appearance?.colors.colLayer1Active ?? "#D6CEE2" property color colRipple: Appearance?.colors.colLayer1Active ?? "#D6CEE2"
property color colRippleToggled: Appearance?.colors.colPrimaryActive ?? "#D6CEE2" property color colRippleToggled: Appearance?.colors.colPrimaryActive ?? "#D6CEE2"
property color buttonColor: root.enabled ? property color buttonColor: root.enabled ?
(root.toggled ? (root.toggled ?
(root.hovered ? colBackgroundToggledHover : colBackgroundToggled) : (root.hovered ? colBackgroundToggledHover : colBackgroundToggled) :
(root.hovered ? colBackgroundHover : colBackground)) : (root.hovered ? colBackgroundHover : colBackground)) :
colBackground colBackground
@@ -61,7 +60,7 @@ Button {
anchors.fill: parent anchors.fill: parent
cursorShape: Qt.PointingHandCursor cursorShape: Qt.PointingHandCursor
acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MiddleButton acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MiddleButton
onPressed: (event) => { onPressed: (event) => {
if(event.button === Qt.RightButton) { if(event.button === Qt.RightButton) {
if (root.altAction) { if (root.altAction) {
root.altAction(); root.altAction();
@@ -156,48 +155,10 @@ Button {
Behavior on color { Behavior on color {
animation: Appearance?.animation.elementMoveFast.colorAnimation.createObject(this) 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 { contentItem: StyledText {
text: root.buttonText text: root.buttonText
color: root.buttonTextColor color: root.buttonTextColor
} }
} }
-18
View File
@@ -7,7 +7,6 @@ import Quickshell.Services.Mpris
import qs.common import qs.common
import qs.common.functions import qs.common.functions
import qs.common.widgets import qs.common.widgets
import Qt5Compat.GraphicalEffects
Item { Item {
// -- fields -- // -- fields --
@@ -93,14 +92,6 @@ Item {
anchors.margins: Appearance.sizes.elevationMargin anchors.margins: Appearance.sizes.elevationMargin
color: blendedColors.colLayer0 color: blendedColors.colLayer0
radius: root.popupRounding radius: root.popupRounding
layer.enabled: true
layer.effect: OpacityMask {
maskSource: Rectangle {
width: background.width
height: background.height
radius: background.radius
}
}
Image { Image {
id: blurredArt id: blurredArt
anchors.fill: parent anchors.fill: parent
@@ -141,15 +132,6 @@ Item {
radius: playerController.artRounding radius: playerController.artRounding
color:ColorUtils.transparentize(blendedColors.colLayer1, 0.5) 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 { Image {
id: mediaArt id: mediaArt
property int size: parent.height property int size: parent.height