initial commit for media widget update + anim tokens restructure
C++ / fmt (pull_request) Successful in 4s
JS/TS / fmt (pull_request) Successful in 20s
JS/TS / lint (pull_request) Successful in 22s
Python / static (pull_request) Successful in 57s
Rust / fmt (pull_request) Successful in 1m2s
C++ / build (pull_request) Successful in 2m10s
Rust / build (pull_request) Successful in 1m50s
Rust / clippy (pull_request) Successful in 1m25s
Python / verify (pull_request) Successful in 2m58s
C++ / clang-tidy (pull_request) Successful in 7m8s
C++ / fmt (pull_request) Successful in 4s
JS/TS / fmt (pull_request) Successful in 20s
JS/TS / lint (pull_request) Successful in 22s
Python / static (pull_request) Successful in 57s
Rust / fmt (pull_request) Successful in 1m2s
C++ / build (pull_request) Successful in 2m10s
Rust / build (pull_request) Successful in 1m50s
Rust / clippy (pull_request) Successful in 1m25s
Python / verify (pull_request) Successful in 2m58s
C++ / clang-tidy (pull_request) Successful in 7m8s
This commit is contained in:
+11
-11
@@ -30,11 +30,11 @@ NumberAnimation {
|
||||
if (type === Anim.DefaultSpatial)
|
||||
return Tokens.anim.durations.expressiveDefaultSpatial;
|
||||
if (type === Anim.SlowSpatial)
|
||||
return Tokens.anim.durations.large;
|
||||
return Tokens.anim.durations.expressiveSlowSpatial;
|
||||
if (type === Anim.FastEffects)
|
||||
return Tokens.anim.durations.expressiveFastEffects;
|
||||
if (type === Anim.DefaultEffects)
|
||||
return Tokens.anim.durations.expressiveEffects;
|
||||
return Tokens.anim.durations.expressiveDefaultEffects;
|
||||
if (type === Anim.SlowEffects)
|
||||
return Tokens.anim.durations.expressiveSlowEffects;
|
||||
|
||||
@@ -42,22 +42,22 @@ NumberAnimation {
|
||||
const idx = type % 4; // 0-7 are the 4 standard types
|
||||
return Tokens.anim.durations[types[idx]];
|
||||
}
|
||||
easing.bezierCurve: {
|
||||
easing: {
|
||||
if (type === Anim.FastSpatial)
|
||||
return Tokens.anim.curves.expressiveFastSpatial;
|
||||
return Tokens.anim.expressiveFastSpatial;
|
||||
if (type === Anim.DefaultSpatial)
|
||||
return Tokens.anim.curves.expressiveDefaultSpatial;
|
||||
return Tokens.anim.expressiveDefaultSpatial;
|
||||
if (type === Anim.SlowSpatial)
|
||||
return Tokens.anim.curves.expressiveSlowSpatial;
|
||||
return Tokens.anim.expressiveSlowSpatial;
|
||||
if (type === Anim.FastEffects)
|
||||
return Tokens.anim.curves.expressiveFastEffects;
|
||||
return Tokens.anim.expressiveFastEffects;
|
||||
if (type === Anim.DefaultEffects)
|
||||
return Tokens.anim.curves.expressiveDefaultEffects;
|
||||
return Tokens.anim.expressiveDefaultEffects;
|
||||
if (type === Anim.SlowEffects)
|
||||
return Tokens.anim.curves.expressiveSlowEffects;
|
||||
return Tokens.anim.expressiveSlowEffects;
|
||||
|
||||
if (type >= Anim.EmphasizedSmall && type <= Anim.EmphasizedExtraLarge)
|
||||
return Tokens.anim.curves.emphasized;
|
||||
return Tokens.anim.curves.standard;
|
||||
return Tokens.anim.emphasized;
|
||||
return Tokens.anim.standard;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,62 +2,6 @@ import QtQuick
|
||||
import ZShell.Config
|
||||
|
||||
ColorAnimation {
|
||||
enum Type {
|
||||
StandardSmall = 0,
|
||||
Standard,
|
||||
StandardLarge,
|
||||
StandardExtraLarge,
|
||||
EmphasizedSmall,
|
||||
Emphasized,
|
||||
EmphasizedLarge,
|
||||
EmphasizedExtraLarge,
|
||||
FastSpatial,
|
||||
DefaultSpatial,
|
||||
SlowSpatial,
|
||||
FastEffects,
|
||||
DefaultEffects,
|
||||
SlowEffects
|
||||
}
|
||||
|
||||
property int type: CAnim.DefaultSpatial
|
||||
|
||||
duration: {
|
||||
if (type < CAnim.StandardSmall || type > Anim.SlowEffects)
|
||||
return Tokens.anim.durations.normal;
|
||||
|
||||
if (type === CAnim.FastSpatial)
|
||||
return Tokens.anim.durations.expressiveFastSpatial;
|
||||
if (type === CAnim.DefaultSpatial)
|
||||
return Tokens.anim.durations.expressiveDefaultSpatial;
|
||||
if (type === CAnim.SlowSpatial)
|
||||
return Tokens.anim.durations.large;
|
||||
if (type === CAnim.FastEffects)
|
||||
return Tokens.anim.durations.expressiveFastEffects;
|
||||
if (type === CAnim.DefaultEffects)
|
||||
return Tokens.anim.durations.expressiveEffects;
|
||||
if (type === CAnim.SlowEffects)
|
||||
return Tokens.anim.durations.expressiveSlowEffects;
|
||||
|
||||
const types = ["small", "normal", "large", "extraLarge"];
|
||||
const idx = type % 4;
|
||||
return Tokens.anim.durations[types[idx]];
|
||||
}
|
||||
easing.bezierCurve: {
|
||||
if (type === CAnim.FastSpatial)
|
||||
return Tokens.anim.curves.expressiveFastSpatial;
|
||||
if (type === CAnim.DefaultSpatial)
|
||||
return Tokens.anim.curves.expressiveDefaultSpatial;
|
||||
if (type === CAnim.SlowSpatial)
|
||||
return Tokens.anim.curves.expressiveSlowSpatial;
|
||||
if (type === CAnim.FastEffects)
|
||||
return Tokens.anim.curves.expressiveFastEffects;
|
||||
if (type === CAnim.DefaultEffects)
|
||||
return Tokens.anim.curves.expressiveDefaultEffects;
|
||||
if (type === CAnim.SlowEffects)
|
||||
return Tokens.anim.curves.expressiveSlowEffects;
|
||||
|
||||
if (type >= CAnim.EmphasizedSmall && type <= Anim.EmphasizedExtraLarge)
|
||||
return Tokens.anim.curves.emphasized;
|
||||
return Tokens.anim.curves.standard;
|
||||
}
|
||||
duration: Tokens.anim.durations.expressiveSlowEffects
|
||||
easing: Tokens.anim.expressiveSlowEffects
|
||||
}
|
||||
|
||||
@@ -23,7 +23,7 @@ BusyIndicator {
|
||||
property real implicitSize: Tokens.font.size.normal * 3
|
||||
property real internalStrokeWidth: strokeWidth
|
||||
readonly property alias progress: manager.progress
|
||||
property real strokeWidth: Tokens.padding.small * 0.8
|
||||
property real strokeWidth: Tokens.padding.extraSmall * 0.8
|
||||
property alias type: manager.indeterminateAnimationType
|
||||
|
||||
implicitHeight: implicitSize
|
||||
|
||||
@@ -21,7 +21,7 @@ Item {
|
||||
readonly property real size: Math.min(width, height)
|
||||
property int spacing: Tokens.spacing.small
|
||||
property int startAngle: -90
|
||||
property int strokeWidth: Tokens.padding.small
|
||||
property int strokeWidth: Tokens.padding.extraSmall
|
||||
property int sweepAngle: 360
|
||||
readonly property real thickness: strokeWidth * (1 + waveAmplitude) * 2
|
||||
property real value
|
||||
|
||||
@@ -27,7 +27,7 @@ TextField {
|
||||
|
||||
color: Colors.palette.m3primary
|
||||
implicitWidth: 2
|
||||
radius: Tokens.rounding.normal
|
||||
radius: Tokens.rounding.medium
|
||||
|
||||
Behavior on opacity {
|
||||
Anim {
|
||||
|
||||
@@ -81,7 +81,7 @@ MouseArea {
|
||||
|
||||
alwaysRunToEnd: true
|
||||
duration: Tokens.anim.durations.expressiveSlowEffects * 2
|
||||
easing.bezierCurve: Tokens.anim.curves.standard
|
||||
easing: Tokens.anim.standard
|
||||
property: "circleRadius"
|
||||
target: root
|
||||
to: root.endRadius
|
||||
|
||||
Reference in New Issue
Block a user