diff options
Diffstat (limited to 'components')
| -rw-r--r-- | components/containers/StyledFlickable.qml | 7 | ||||
| -rw-r--r-- | components/containers/StyledListView.qml | 7 | ||||
| -rw-r--r-- | components/controls/FilledSlider.qml | 10 | ||||
| -rw-r--r-- | components/controls/StyledBusyIndicator.qml | 5 | ||||
| -rw-r--r-- | components/controls/StyledScrollBar.qml | 6 | ||||
| -rw-r--r-- | components/controls/StyledSwitch.qml | 12 | ||||
| -rw-r--r-- | components/controls/StyledTextField.qml | 4 | ||||
| -rw-r--r-- | components/effects/Elevation.qml | 8 | ||||
| -rw-r--r-- | components/filedialog/CurrentItem.qml | 12 | ||||
| -rw-r--r-- | components/filedialog/Sidebar.qml | 6 | ||||
| -rw-r--r-- | components/widgets/ExtraIndicator.qml | 7 |
11 files changed, 21 insertions, 63 deletions
diff --git a/components/containers/StyledFlickable.qml b/components/containers/StyledFlickable.qml index 7b2a75e..bc6ae0f 100644 --- a/components/containers/StyledFlickable.qml +++ b/components/containers/StyledFlickable.qml @@ -1,4 +1,4 @@ -import qs.config +import ".." import QtQuick Flickable { @@ -7,11 +7,8 @@ Flickable { maximumFlickVelocity: 3000 rebound: Transition { - NumberAnimation { + Anim { properties: "x,y" - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard } } } diff --git a/components/containers/StyledListView.qml b/components/containers/StyledListView.qml index b59eca8..626d206 100644 --- a/components/containers/StyledListView.qml +++ b/components/containers/StyledListView.qml @@ -1,4 +1,4 @@ -import qs.config +import ".." import QtQuick ListView { @@ -7,11 +7,8 @@ ListView { maximumFlickVelocity: 3000 rebound: Transition { - NumberAnimation { + Anim { properties: "x,y" - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard } } } diff --git a/components/controls/FilledSlider.qml b/components/controls/FilledSlider.qml index af60e9f..4ddbfda 100644 --- a/components/controls/FilledSlider.qml +++ b/components/controls/FilledSlider.qml @@ -80,25 +80,23 @@ Slider { Behavior on moving { SequentialAnimation { - NumberAnimation { + Anim { target: icon property: "scale" from: 1 to: 0 duration: Appearance.anim.durations.normal / 2 - easing.type: Easing.BezierSpline easing.bezierCurve: Appearance.anim.curves.standardAccel } ScriptAction { script: icon.update() } - NumberAnimation { + Anim { target: icon property: "scale" from: 0 to: 1 duration: Appearance.anim.durations.normal / 2 - easing.type: Easing.BezierSpline easing.bezierCurve: Appearance.anim.curves.standardDecel } } @@ -128,10 +126,8 @@ Slider { } Behavior on value { - NumberAnimation { + Anim { duration: Appearance.anim.durations.large - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard } } } diff --git a/components/controls/StyledBusyIndicator.qml b/components/controls/StyledBusyIndicator.qml index cc97c52..9fd1c3e 100644 --- a/components/controls/StyledBusyIndicator.qml +++ b/components/controls/StyledBusyIndicator.qml @@ -1,3 +1,4 @@ +import ".." import qs.services import qs.config import QtQuick @@ -39,11 +40,9 @@ BusyIndicator { } transitions: Transition { - NumberAnimation { + Anim { properties: "opacity,internalStrokeWidth" duration: updater.completeEndDuration - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard } } diff --git a/components/controls/StyledScrollBar.qml b/components/controls/StyledScrollBar.qml index 61ddc6d..69a01f3 100644 --- a/components/controls/StyledScrollBar.qml +++ b/components/controls/StyledScrollBar.qml @@ -14,11 +14,7 @@ ScrollBar { color: Colours.palette.m3secondary Behavior on opacity { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + Anim {} } } diff --git a/components/controls/StyledSwitch.qml b/components/controls/StyledSwitch.qml index af5c07d..ecc1076 100644 --- a/components/controls/StyledSwitch.qml +++ b/components/controls/StyledSwitch.qml @@ -39,7 +39,7 @@ Switch { opacity: root.pressed ? 0.1 : root.hovered ? 0.08 : 0 Behavior on opacity { - NumberAnim {} + Anim {} } } @@ -129,11 +129,11 @@ Switch { } Behavior on x { - NumberAnim {} + Anim {} } Behavior on implicitWidth { - NumberAnim {} + Anim {} } } } @@ -144,12 +144,6 @@ Switch { enabled: false } - component NumberAnim: NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } - component PropAnim: PropertyAnimation { duration: Appearance.anim.durations.normal easing.type: Easing.BezierSpline diff --git a/components/controls/StyledTextField.qml b/components/controls/StyledTextField.qml index 7817799..4db87e9 100644 --- a/components/controls/StyledTextField.qml +++ b/components/controls/StyledTextField.qml @@ -60,10 +60,8 @@ TextField { } Behavior on opacity { - NumberAnimation { + Anim { duration: Appearance.anim.durations.small - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard } } } diff --git a/components/effects/Elevation.qml b/components/effects/Elevation.qml index 999b199..fb29f16 100644 --- a/components/effects/Elevation.qml +++ b/components/effects/Elevation.qml @@ -1,5 +1,5 @@ +import ".." import qs.services -import qs.config import QtQuick import QtQuick.Effects @@ -13,10 +13,6 @@ RectangularShadow { offset.y: dp / 2 Behavior on dp { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + Anim {} } } diff --git a/components/filedialog/CurrentItem.qml b/components/filedialog/CurrentItem.qml index bb4d55e..c06c91f 100644 --- a/components/filedialog/CurrentItem.qml +++ b/components/filedialog/CurrentItem.qml @@ -86,18 +86,10 @@ Item { Behavior on implicitWidth { enabled: !!root.currentItem - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + Anim {} } Behavior on implicitHeight { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + Anim {} } } diff --git a/components/filedialog/Sidebar.qml b/components/filedialog/Sidebar.qml index e9a15bd..b55d7b3 100644 --- a/components/filedialog/Sidebar.qml +++ b/components/filedialog/Sidebar.qml @@ -95,11 +95,7 @@ StyledRect { fill: place.selected ? 1 : 0 Behavior on fill { - NumberAnimation { - duration: Appearance.anim.durations.normal - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard - } + Anim {} } } diff --git a/components/widgets/ExtraIndicator.qml b/components/widgets/ExtraIndicator.qml index 6034b33..db73ea0 100644 --- a/components/widgets/ExtraIndicator.qml +++ b/components/widgets/ExtraIndicator.qml @@ -37,17 +37,14 @@ StyledRect { } Behavior on opacity { - NumberAnimation { + Anim { duration: Appearance.anim.durations.expressiveFastSpatial - easing.type: Easing.BezierSpline - easing.bezierCurve: Appearance.anim.curves.standard } } Behavior on scale { - NumberAnimation { + Anim { duration: Appearance.anim.durations.expressiveFastSpatial - easing.type: Easing.BezierSpline easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial } } |