MaterialIcon opsz clamp, UPower popout and widget changes, improved SysTray hover detection logic
This commit is contained in:
@@ -0,0 +1,51 @@
|
||||
import QtQuick
|
||||
import qs.Config
|
||||
|
||||
AnchorAnimation {
|
||||
enum Type {
|
||||
StandardSmall = 0,
|
||||
Standard,
|
||||
StandardLarge,
|
||||
StandardExtraLarge,
|
||||
EmphasizedSmall,
|
||||
Emphasized,
|
||||
EmphasizedLarge,
|
||||
EmphasizedExtraLarge,
|
||||
FastSpatial,
|
||||
DefaultSpatial,
|
||||
SlowSpatial
|
||||
}
|
||||
|
||||
property int type: AnchorAnim.DefaultSpatial
|
||||
|
||||
duration: {
|
||||
if (type < AnchorAnim.StandardSmall || type > AnchorAnim.SlowSpatial)
|
||||
return Appearance.anim.durations.expressiveDefaultSpatial;
|
||||
|
||||
if (type == AnchorAnim.FastSpatial)
|
||||
return Appearance.anim.durations.expressiveFastSpatial;
|
||||
if (type == AnchorAnim.DefaultSpatial)
|
||||
return Appearance.anim.durations.expressiveDefaultSpatial;
|
||||
if (type == AnchorAnim.SlowSpatial)
|
||||
return Appearance.anim.durations.large;
|
||||
|
||||
const types = ["small", "normal", "large", "extraLarge"];
|
||||
const idx = type % 4;
|
||||
return Appearance.anim.durations[types[idx]];
|
||||
}
|
||||
easing.bezierCurve: {
|
||||
if (type == AnchorAnim.FastSpatial)
|
||||
return Appearance.anim.curves.expressiveFastSpatial;
|
||||
if (type == AnchorAnim.DefaultSpatial)
|
||||
return Appearance.anim.curves.expressiveDefaultSpatial;
|
||||
if (type == AnchorAnim.SlowSpatial)
|
||||
return Appearance.anim.curves.expressiveSlowSpatial;
|
||||
|
||||
if (type >= AnchorAnim.StandardSmall && type <= AnchorAnim.StandardExtraLarge)
|
||||
return Appearance.anim.curves.standard;
|
||||
if (type >= AnchorAnim.EmphasizedSmall && type <= AnchorAnim.EmphasizedExtraLarge)
|
||||
return Appearance.anim.curves.emphasized;
|
||||
|
||||
return Appearance.anim.curves.expressiveDefaultSpatial;
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -39,7 +39,7 @@ NumberAnimation {
|
||||
return Appearance.anim.durations.expressiveSlowEffects;
|
||||
|
||||
const types = ["small", "normal", "large", "extraLarge"];
|
||||
const idx = type % 4; // 0-7 are the 4 standard types
|
||||
const idx = type % 4;
|
||||
return Appearance.anim.durations[types[idx]];
|
||||
}
|
||||
easing.bezierCurve: {
|
||||
|
||||
@@ -28,25 +28,21 @@ Text {
|
||||
|
||||
SequentialAnimation {
|
||||
Anim {
|
||||
easing.bezierCurve: MaterialEasing.standardAccel
|
||||
property: root.animateProp
|
||||
target: root
|
||||
to: root.animateFrom
|
||||
type: Anim.FastEffects
|
||||
}
|
||||
|
||||
PropertyAction {
|
||||
}
|
||||
|
||||
Anim {
|
||||
easing.bezierCurve: MaterialEasing.standardDecel
|
||||
property: root.animateProp
|
||||
target: root
|
||||
to: root.animateTo
|
||||
type: Anim.DefaultEffects
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
component Anim: NumberAnimation {
|
||||
duration: root.animateDuration / 2
|
||||
easing.type: Easing.BezierSpline
|
||||
properties: root.animateProp.split(",").length > 1 ? root.animateProp : ""
|
||||
property: root.animateProp.split(",").length === 1 ? root.animateProp : ""
|
||||
target: root
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,15 +1,26 @@
|
||||
import qs.Config
|
||||
|
||||
CustomText {
|
||||
property real fill
|
||||
id: root
|
||||
|
||||
readonly property list<int> allowed: [20, 24, 40, 48]
|
||||
property real fill: 0
|
||||
property int grade: DynamicColors.light ? 0 : -25
|
||||
readonly property int opsz: clampOpsz(optical)
|
||||
property int optical: fontInfo.pixelSize
|
||||
|
||||
function clampOpsz(value): int {
|
||||
return allowed.reduce((closest, current) => {
|
||||
return Math.abs(current - value) < Math.abs(closest - value) ? current : closest;
|
||||
});
|
||||
}
|
||||
|
||||
font.family: "Material Symbols Rounded"
|
||||
font.pointSize: Appearance.font.size.larger
|
||||
font.variableAxes: ({
|
||||
FILL: fill.toFixed(1),
|
||||
FILL: fill,
|
||||
GRAD: grade,
|
||||
opsz: fontInfo.pixelSize,
|
||||
opsz: opsz,
|
||||
wght: fontInfo.weight
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user