From d2373e03a5cbd0cb97e9c5e32966a0c0afd80f10 Mon Sep 17 00:00:00 2001 From: ATMDA Date: Sun, 16 Nov 2025 19:07:51 -0500 Subject: controlcenter: FIXED animation bug with sub-text --- components/controls/CollapsibleSection.qml | 80 +++++------------------------- 1 file changed, 12 insertions(+), 68 deletions(-) (limited to 'components') diff --git a/components/controls/CollapsibleSection.qml b/components/controls/CollapsibleSection.qml index aa206ba..35acdec 100644 --- a/components/controls/CollapsibleSection.qml +++ b/components/controls/CollapsibleSection.qml @@ -68,74 +68,6 @@ ColumnLayout { } } - Item { - Layout.fillWidth: true - Layout.preferredHeight: (root.expanded && root.description !== "") ? Math.min(descriptionText.implicitHeight + Appearance.spacing.smaller + Appearance.spacing.small, maxDescriptionHeight) : 0 - - readonly property real maxDescriptionHeight: 60 - - layer.enabled: true - layer.smooth: true - layer.effect: OpacityMask { - maskSource: descriptionMask - } - - Behavior on Layout.preferredHeight { - Anim { - easing.bezierCurve: Appearance.anim.curves.standard - } - } - - Item { - id: descriptionMask - anchors.fill: parent - layer.enabled: true - visible: false - - Rectangle { - anchors.fill: parent - - gradient: Gradient { - orientation: Gradient.Vertical - - GradientStop { - position: 0.0 - color: Qt.rgba(0, 0, 0, 1) - } - GradientStop { - position: 0.7 - color: Qt.rgba(0, 0, 0, 1) - } - GradientStop { - position: 1.0 - color: Qt.rgba(0, 0, 0, 0) - } - } - } - } - - StyledText { - id: descriptionText - anchors.left: parent.left - anchors.right: parent.right - anchors.top: parent.top - anchors.leftMargin: Appearance.padding.normal - anchors.rightMargin: Appearance.padding.normal - anchors.topMargin: Appearance.spacing.smaller - text: root.description - color: Colours.palette.m3onSurfaceVariant - font.pointSize: Appearance.font.size.small - wrapMode: Text.Wrap - opacity: (root.expanded && root.description !== "") ? 1.0 : 0.0 - - Behavior on opacity { - Anim { - easing.bezierCurve: Appearance.anim.curves.standard - } - } - } - } - default property alias content: contentColumn.data Item { @@ -166,6 +98,18 @@ ColumnLayout { easing.bezierCurve: Appearance.anim.curves.standard } } + + StyledText { + id: descriptionText + Layout.fillWidth: true + Layout.topMargin: root.description !== "" ? Appearance.spacing.smaller : 0 + Layout.bottomMargin: root.description !== "" ? Appearance.spacing.small : 0 + visible: root.description !== "" + text: root.description + color: Colours.palette.m3onSurfaceVariant + font.pointSize: Appearance.font.size.small + wrapMode: Text.Wrap + } } } } -- cgit v1.2.3-freya