summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/bar/components/ActiveWindow.qml17
-rw-r--r--modules/bar/components/StatusIcons.qml17
-rw-r--r--modules/bar/components/Tray.qml17
-rw-r--r--widgets/StyledRect.qml21
4 files changed, 48 insertions, 24 deletions
diff --git a/modules/bar/components/ActiveWindow.qml b/modules/bar/components/ActiveWindow.qml
index eeea3ac..0e24242 100644
--- a/modules/bar/components/ActiveWindow.qml
+++ b/modules/bar/components/ActiveWindow.qml
@@ -11,7 +11,6 @@ StyledRect {
property color colour: Colours.palette.pink
- animate: true
clip: true
MaterialIcon {
@@ -53,4 +52,20 @@ StyledRect {
elide: Qt.ElideRight
elideWidth: root.vertical ? BarConfig.sizes.maxLabelHeight : BarConfig.sizes.maxLabelWidth
}
+
+ Behavior on implicitWidth {
+ NumberAnimation {
+ duration: Appearance.anim.durations.normal
+ easing.type: Easing.BezierSpline
+ easing.bezierCurve: Appearance.anim.curves.emphasized
+ }
+ }
+
+ Behavior on implicitHeight {
+ NumberAnimation {
+ duration: Appearance.anim.durations.normal
+ easing.type: Easing.BezierSpline
+ easing.bezierCurve: Appearance.anim.curves.emphasized
+ }
+ }
}
diff --git a/modules/bar/components/StatusIcons.qml b/modules/bar/components/StatusIcons.qml
index cb5dc58..62823e0 100644
--- a/modules/bar/components/StatusIcons.qml
+++ b/modules/bar/components/StatusIcons.qml
@@ -10,7 +10,6 @@ StyledRect {
property color colour: Colours.palette.rosewater
- animate: true
clip: true
MaterialIcon {
@@ -58,4 +57,20 @@ StyledRect {
}
}
}
+
+ Behavior on implicitWidth {
+ NumberAnimation {
+ duration: Appearance.anim.durations.normal
+ easing.type: Easing.BezierSpline
+ easing.bezierCurve: Appearance.anim.curves.emphasized
+ }
+ }
+
+ Behavior on implicitHeight {
+ NumberAnimation {
+ duration: Appearance.anim.durations.normal
+ easing.type: Easing.BezierSpline
+ easing.bezierCurve: Appearance.anim.curves.emphasized
+ }
+ }
}
diff --git a/modules/bar/components/Tray.qml b/modules/bar/components/Tray.qml
index a635b76..ccebe1f 100644
--- a/modules/bar/components/Tray.qml
+++ b/modules/bar/components/Tray.qml
@@ -9,7 +9,6 @@ StyledRect {
property color colour: Colours.palette.lavender
- animate: true
clip: true
visible: width > 0 && height > 0 // To avoid warnings about being visible with no size
@@ -22,4 +21,20 @@ StyledRect {
}
}
}
+
+ Behavior on implicitWidth {
+ NumberAnimation {
+ duration: Appearance.anim.durations.normal
+ easing.type: Easing.BezierSpline
+ easing.bezierCurve: Appearance.anim.curves.emphasized
+ }
+ }
+
+ Behavior on implicitHeight {
+ NumberAnimation {
+ duration: Appearance.anim.durations.normal
+ easing.type: Easing.BezierSpline
+ easing.bezierCurve: Appearance.anim.curves.emphasized
+ }
+ }
}
diff --git a/widgets/StyledRect.qml b/widgets/StyledRect.qml
index bb9824c..984ed84 100644
--- a/widgets/StyledRect.qml
+++ b/widgets/StyledRect.qml
@@ -4,7 +4,6 @@ import QtQuick
Rectangle {
id: root
- property bool animate: false
property bool vertical: parent.vertical ?? false // Convenience property for propagation to children
color: "transparent"
@@ -18,24 +17,4 @@ Rectangle {
easing.bezierCurve: Appearance.anim.curves.standard
}
}
-
- Behavior on implicitWidth {
- enabled: root.animate
-
- NumberAnimation {
- duration: Appearance.anim.durations.normal
- easing.type: Easing.BezierSpline
- easing.bezierCurve: Appearance.anim.curves.emphasized
- }
- }
-
- Behavior on implicitHeight {
- enabled: root.animate
-
- NumberAnimation {
- duration: Appearance.anim.durations.normal
- easing.type: Easing.BezierSpline
- easing.bezierCurve: Appearance.anim.curves.emphasized
- }
- }
}