diff options
25 files changed, 46 insertions, 152 deletions
diff --git a/components/CAnim.qml b/components/CAnim.qml new file mode 100644 index 0000000..49484b7 --- /dev/null +++ b/components/CAnim.qml @@ -0,0 +1,8 @@ +import qs.config +import QtQuick + +ColorAnimation { + duration: Appearance.anim.durations.normal + easing.type: Easing.BezierSpline + easing.bezierCurve: Appearance.anim.curves.standard +} diff --git a/components/StyledClippingRect.qml b/components/StyledClippingRect.qml index 8e15c4c..8f2630c 100644 --- a/components/StyledClippingRect.qml +++ b/components/StyledClippingRect.qml @@ -1,4 +1,3 @@ -import qs.config import Quickshell.Widgets import QtQuick @@ -8,10 +7,6 @@ ClippingRectangle { color: "transparent" Behavior on color { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + CAnim {} } } diff --git a/components/StyledRect.qml b/components/StyledRect.qml index c052b2a..f5d5143 100644 --- a/components/StyledRect.qml +++ b/components/StyledRect.qml @@ -1,4 +1,3 @@ -import qs.config import QtQuick Rectangle { @@ -7,10 +6,6 @@ Rectangle { color: "transparent" Behavior on color { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + CAnim {} } } diff --git a/components/StyledText.qml b/components/StyledText.qml index 554c20c..ed961d2 100644 --- a/components/StyledText.qml +++ b/components/StyledText.qml @@ -20,11 +20,7 @@ Text { font.pointSize: Appearance.font.size.smaller Behavior on color { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + CAnim {} } Behavior on text { diff --git a/components/controls/StyledRadioButton.qml b/components/controls/StyledRadioButton.qml index 7a44baa..781ff7f 100644 --- a/components/controls/StyledRadioButton.qml +++ b/components/controls/StyledRadioButton.qml @@ -40,11 +40,7 @@ RadioButton { } Behavior on border.color { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + CAnim {} } } diff --git a/components/controls/StyledSwitch.qml b/components/controls/StyledSwitch.qml index 7b23712..af5c07d 100644 --- a/components/controls/StyledSwitch.qml +++ b/components/controls/StyledSwitch.qml @@ -110,11 +110,7 @@ Switch { } Behavior on strokeColor { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + CAnim {} } } diff --git a/components/controls/StyledTextField.qml b/components/controls/StyledTextField.qml index 30db314..7817799 100644 --- a/components/controls/StyledTextField.qml +++ b/components/controls/StyledTextField.qml @@ -69,18 +69,10 @@ TextField { } Behavior on color { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + CAnim {} } Behavior on placeholderTextColor { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + CAnim {} } } diff --git a/components/effects/Colouriser.qml b/components/effects/Colouriser.qml index bddf573..2948155 100644 --- a/components/effects/Colouriser.qml +++ b/components/effects/Colouriser.qml @@ -1,4 +1,4 @@ -import qs.config +import ".." import QtQuick import QtQuick.Effects @@ -9,10 +9,6 @@ MultiEffect { brightness: 1 - sourceColor.hslLightness Behavior on colorizationColor { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + CAnim {} } } diff --git a/components/filedialog/CurrentItem.qml b/components/filedialog/CurrentItem.qml index 9f8ffac..bb4d55e 100644 --- a/components/filedialog/CurrentItem.qml +++ b/components/filedialog/CurrentItem.qml @@ -62,11 +62,7 @@ Item { } Behavior on fillColor { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + CAnim {} } } } diff --git a/components/filedialog/FileDialog.qml b/components/filedialog/FileDialog.qml index 8b0b331..0deff32 100644 --- a/components/filedialog/FileDialog.qml +++ b/components/filedialog/FileDialog.qml @@ -1,7 +1,7 @@ pragma ComponentBehavior: Bound +import qs.components import qs.services -import qs.config import Quickshell import QtQuick import QtQuick.Layouts @@ -96,11 +96,7 @@ LazyLoader { } Behavior on color { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + CAnim {} } } } diff --git a/modules/areapicker/Picker.qml b/modules/areapicker/Picker.qml index 9392c81..cd94047 100644 --- a/modules/areapicker/Picker.qml +++ b/modules/areapicker/Picker.qml @@ -243,11 +243,7 @@ MouseArea { implicitHeight: selectionRect.implicitHeight + root.realBorderWidth * 2 Behavior on border.color { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + CAnim {} } } diff --git a/modules/bar/popouts/Background.qml b/modules/bar/popouts/Background.qml index 14f5f20..9e78eeb 100644 --- a/modules/bar/popouts/Background.qml +++ b/modules/bar/popouts/Background.qml @@ -1,3 +1,4 @@ +import qs.components import qs.services import qs.config import QtQuick @@ -59,11 +60,7 @@ ShapePath { } Behavior on fillColor { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + CAnim {} } Behavior on ibr { diff --git a/modules/controlcenter/WindowFactory.qml b/modules/controlcenter/WindowFactory.qml index cc80e72..c5b7535 100644 --- a/modules/controlcenter/WindowFactory.qml +++ b/modules/controlcenter/WindowFactory.qml @@ -1,7 +1,7 @@ pragma Singleton +import qs.components import qs.services -import qs.config import Quickshell import QtQuick @@ -53,11 +53,7 @@ Singleton { } Behavior on color { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + CAnim {} } } } diff --git a/modules/controlcenter/bluetooth/Details.qml b/modules/controlcenter/bluetooth/Details.qml index a31e381..104f673 100644 --- a/modules/controlcenter/bluetooth/Details.qml +++ b/modules/controlcenter/bluetooth/Details.qml @@ -203,11 +203,7 @@ Item { opacity: root.session.bt.editingDeviceName ? 1 : 0 Behavior on border.color { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + CAnim {} } Behavior on opacity { diff --git a/modules/controlcenter/bluetooth/Settings.qml b/modules/controlcenter/bluetooth/Settings.qml index e035964..fb493ff 100644 --- a/modules/controlcenter/bluetooth/Settings.qml +++ b/modules/controlcenter/bluetooth/Settings.qml @@ -363,11 +363,7 @@ ColumnLayout { opacity: root.session.bt.editingAdapterName ? 1 : 0 Behavior on border.color { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + CAnim {} } Behavior on opacity { diff --git a/modules/dashboard/Background.qml b/modules/dashboard/Background.qml index 11957e3..e2a91f7 100644 --- a/modules/dashboard/Background.qml +++ b/modules/dashboard/Background.qml @@ -1,3 +1,4 @@ +import qs.components import qs.services import qs.config import QtQuick @@ -60,10 +61,6 @@ ShapePath { } Behavior on fillColor { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + CAnim {} } } diff --git a/modules/dashboard/Media.qml b/modules/dashboard/Media.qml index 41d844c..9e61094 100644 --- a/modules/dashboard/Media.qml +++ b/modules/dashboard/Media.qml @@ -106,11 +106,7 @@ Item { } Behavior on strokeColor { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + CAnim {} } } } diff --git a/modules/dashboard/Performance.qml b/modules/dashboard/Performance.qml index 68281f6..e29b0eb 100644 --- a/modules/dashboard/Performance.qml +++ b/modules/dashboard/Performance.qml @@ -217,35 +217,19 @@ RowLayout { } Behavior on fg1 { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + CAnim {} } Behavior on fg2 { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + CAnim {} } Behavior on bg1 { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + CAnim {} } Behavior on bg2 { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + CAnim {} } } } diff --git a/modules/dashboard/dash/Media.qml b/modules/dashboard/dash/Media.qml index ada469f..5daa581 100644 --- a/modules/dashboard/dash/Media.qml +++ b/modules/dashboard/dash/Media.qml @@ -52,11 +52,7 @@ Item { } Behavior on strokeColor { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + CAnim {} } } @@ -76,11 +72,7 @@ Item { } Behavior on strokeColor { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + CAnim {} } } } diff --git a/modules/launcher/Background.qml b/modules/launcher/Background.qml index a50f379..709c7d0 100644 --- a/modules/launcher/Background.qml +++ b/modules/launcher/Background.qml @@ -1,3 +1,4 @@ +import qs.components import qs.services import qs.config import QtQuick @@ -54,10 +55,6 @@ ShapePath { } Behavior on fillColor { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + CAnim {} } } diff --git a/modules/lock/Resources.qml b/modules/lock/Resources.qml index 8ff1708..7dda218 100644 --- a/modules/lock/Resources.qml +++ b/modules/lock/Resources.qml @@ -5,7 +5,6 @@ import qs.services import qs.config import QtQuick import QtQuick.Layouts -import QtQuick.Shapes GridLayout { id: root @@ -93,10 +92,4 @@ GridLayout { } } } - - component Anim: ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } } diff --git a/modules/notifications/Background.qml b/modules/notifications/Background.qml index 03034ab..215012f 100644 --- a/modules/notifications/Background.qml +++ b/modules/notifications/Background.qml @@ -1,3 +1,4 @@ +import qs.components import qs.services import qs.config import Quickshell @@ -49,11 +50,7 @@ ShapePath { } Behavior on fillColor { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + CAnim {} } Behavior on fullHeightRounding { diff --git a/modules/osd/Background.qml b/modules/osd/Background.qml index 844b4a8..78955c7 100644 --- a/modules/osd/Background.qml +++ b/modules/osd/Background.qml @@ -1,3 +1,4 @@ +import qs.components import qs.services import qs.config import QtQuick @@ -54,10 +55,6 @@ ShapePath { } Behavior on fillColor { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + CAnim {} } } diff --git a/modules/session/Background.qml b/modules/session/Background.qml index 844b4a8..78955c7 100644 --- a/modules/session/Background.qml +++ b/modules/session/Background.qml @@ -1,3 +1,4 @@ +import qs.components import qs.services import qs.config import QtQuick @@ -54,10 +55,6 @@ ShapePath { } Behavior on fillColor { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + CAnim {} } } diff --git a/modules/utilities/Background.qml b/modules/utilities/Background.qml index b3d513b..5dc2c13 100644 --- a/modules/utilities/Background.qml +++ b/modules/utilities/Background.qml @@ -1,3 +1,4 @@ +import qs.components import qs.services import qs.config import QtQuick @@ -48,10 +49,6 @@ ShapePath { } Behavior on fillColor { - ColorAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + CAnim {} } } |