animScale config option
This commit is contained in:
@@ -1,5 +1,6 @@
|
|||||||
import Quickshell.Io
|
import Quickshell.Io
|
||||||
import qs.Modules
|
import qs.Modules
|
||||||
|
import qs.Config
|
||||||
|
|
||||||
JsonObject {
|
JsonObject {
|
||||||
property int wallFadeDuration: MaterialEasing.standardTime
|
property int wallFadeDuration: MaterialEasing.standardTime
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ Singleton {
|
|||||||
property alias barConfig: adapter.barConfig
|
property alias barConfig: adapter.barConfig
|
||||||
property alias transparency: adapter.transparency
|
property alias transparency: adapter.transparency
|
||||||
property alias baseFont: adapter.baseFont
|
property alias baseFont: adapter.baseFont
|
||||||
|
property alias animScale: adapter.animScale
|
||||||
|
|
||||||
FileView {
|
FileView {
|
||||||
id: root
|
id: root
|
||||||
@@ -50,6 +51,7 @@ Singleton {
|
|||||||
property BarConfig barConfig: BarConfig {}
|
property BarConfig barConfig: BarConfig {}
|
||||||
property Transparency transparency: Transparency {}
|
property Transparency transparency: Transparency {}
|
||||||
property string baseFont: "Segoe UI Variable Text"
|
property string baseFont: "Segoe UI Variable Text"
|
||||||
|
property real animScale: 1.0
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,22 +4,24 @@ import Quickshell
|
|||||||
Singleton {
|
Singleton {
|
||||||
id: root
|
id: root
|
||||||
|
|
||||||
|
property real scale: Config.animScale
|
||||||
|
|
||||||
readonly property list<real> emphasized: [0.05, 0, 2 / 15, 0.06, 1 / 6, 0.4, 5 / 24, 0.82, 0.25, 1, 1, 1]
|
readonly property list<real> emphasized: [0.05, 0, 2 / 15, 0.06, 1 / 6, 0.4, 5 / 24, 0.82, 0.25, 1, 1, 1]
|
||||||
readonly property list<real> emphasizedAccel: [0.3, 0, 0.8, 0.15, 1, 1]
|
readonly property list<real> emphasizedAccel: [0.3, 0, 0.8, 0.15, 1, 1]
|
||||||
readonly property int emphasizedAccelTime: 200
|
readonly property int emphasizedAccelTime: 200 * scale
|
||||||
readonly property list<real> emphasizedDecel: [0.05, 0.7, 0.1, 1, 1, 1]
|
readonly property list<real> emphasizedDecel: [0.05, 0.7, 0.1, 1, 1, 1]
|
||||||
readonly property int emphasizedDecelTime: 400
|
readonly property int emphasizedDecelTime: 400 * scale
|
||||||
readonly property int emphasizedTime: 500
|
readonly property int emphasizedTime: 500 * scale
|
||||||
readonly property list<real> expressiveDefaultSpatial: [0.38, 1.21, 0.22, 1.00, 1, 1]
|
readonly property list<real> expressiveDefaultSpatial: [0.38, 1.21, 0.22, 1.00, 1, 1]
|
||||||
readonly property int expressiveDefaultSpatialTime: 500
|
readonly property int expressiveDefaultSpatialTime: 500 * scale
|
||||||
readonly property list<real> expressiveEffects: [0.34, 0.80, 0.34, 1.00, 1, 1]
|
readonly property list<real> expressiveEffects: [0.34, 0.80, 0.34, 1.00, 1, 1]
|
||||||
readonly property int expressiveEffectsTime: 200
|
readonly property int expressiveEffectsTime: 200 * scale
|
||||||
readonly property list<real> expressiveFastSpatial: [0.42, 1.67, 0.21, 0.90, 1, 1]
|
readonly property list<real> expressiveFastSpatial: [0.42, 1.67, 0.21, 0.90, 1, 1]
|
||||||
readonly property int expressiveFastSpatialTime: 350
|
readonly property int expressiveFastSpatialTime: 350 * scale
|
||||||
readonly property list<real> standard: [0.2, 0, 0, 1, 1, 1]
|
readonly property list<real> standard: [0.2, 0, 0, 1, 1, 1]
|
||||||
readonly property list<real> standardAccel: [0.3, 0, 1, 1, 1, 1]
|
readonly property list<real> standardAccel: [0.3, 0, 1, 1, 1, 1]
|
||||||
readonly property int standardAccelTime: 200
|
readonly property int standardAccelTime: 200 * scale
|
||||||
readonly property list<real> standardDecel: [0, 0, 0, 1, 1, 1]
|
readonly property list<real> standardDecel: [0, 0, 0, 1, 1, 1]
|
||||||
readonly property int standardDecelTime: 250
|
readonly property int standardDecelTime: 250 * scale
|
||||||
readonly property int standardTime: 300
|
readonly property int standardTime: 300 * scale
|
||||||
}
|
}
|
||||||
+2
-1
@@ -1,8 +1,9 @@
|
|||||||
import QtQuick
|
import QtQuick
|
||||||
import qs.Modules
|
import qs.Modules
|
||||||
|
import qs.Config
|
||||||
|
|
||||||
NumberAnimation {
|
NumberAnimation {
|
||||||
duration: 400
|
duration: MaterialEasing.standardTime
|
||||||
easing.type: Easing.BezierSpline
|
easing.type: Easing.BezierSpline
|
||||||
easing.bezierCurve: MaterialEasing.standard
|
easing.bezierCurve: MaterialEasing.standard
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-1
@@ -1,8 +1,9 @@
|
|||||||
import QtQuick
|
import QtQuick
|
||||||
import qs.Modules
|
import qs.Modules
|
||||||
|
import qs.Config
|
||||||
|
|
||||||
ColorAnimation {
|
ColorAnimation {
|
||||||
duration: 400
|
duration: MaterialEasing.standardTime
|
||||||
easing.type: Easing.BezierSpline
|
easing.type: Easing.BezierSpline
|
||||||
easing.bezierCurve: MaterialEasing.standard
|
easing.bezierCurve: MaterialEasing.standard
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -80,7 +80,7 @@ Scope {
|
|||||||
id: openAnim
|
id: openAnim
|
||||||
Anim {
|
Anim {
|
||||||
target: appListRect
|
target: appListRect
|
||||||
duration: MaterialEasing.expressiveFastSpatialTime
|
duration: MaterialEasing.expressiveDefaultSpatialTime
|
||||||
easing.bezierCurve: MaterialEasing.expressiveDefaultSpatial
|
easing.bezierCurve: MaterialEasing.expressiveDefaultSpatial
|
||||||
property: "implicitHeight"
|
property: "implicitHeight"
|
||||||
from: 40
|
from: 40
|
||||||
@@ -116,11 +116,11 @@ Scope {
|
|||||||
id: closeAnim
|
id: closeAnim
|
||||||
Anim {
|
Anim {
|
||||||
target: appListRect
|
target: appListRect
|
||||||
duration: MaterialEasing.expressiveFastSpatialTime
|
duration: MaterialEasing.expressiveDefaultSpatialTime
|
||||||
easing.bezierCurve: MaterialEasing.expressiveDefaultSpatial
|
easing.bezierCurve: MaterialEasing.expressiveDefaultSpatial
|
||||||
property: "implicitHeight"
|
property: "implicitHeight"
|
||||||
from: appListContainer.implicitHeight
|
from: appListContainer.implicitHeight
|
||||||
to: 40
|
to: 0
|
||||||
}
|
}
|
||||||
SequentialAnimation {
|
SequentialAnimation {
|
||||||
PauseAnimation { duration: 120 }
|
PauseAnimation { duration: 120 }
|
||||||
|
|||||||
+2
-2
@@ -22,7 +22,7 @@ Item {
|
|||||||
property string queuedMode
|
property string queuedMode
|
||||||
readonly property bool isDetached: detachedMode.length > 0
|
readonly property bool isDetached: detachedMode.length > 0
|
||||||
|
|
||||||
property int animLength: 400
|
property int animLength: MaterialEasing.emphasizedDecelTime
|
||||||
property list<real> animCurve: MaterialEasing.emphasized
|
property list<real> animCurve: MaterialEasing.emphasized
|
||||||
|
|
||||||
function detach(mode: string): void {
|
function detach(mode: string): void {
|
||||||
@@ -39,7 +39,7 @@ Item {
|
|||||||
function close(): void {
|
function close(): void {
|
||||||
hasCurrent = false;
|
hasCurrent = false;
|
||||||
animCurve = MaterialEasing.emphasizedDecel;
|
animCurve = MaterialEasing.emphasizedDecel;
|
||||||
animLength = 400;
|
animLength = MaterialEasing.emphasizedDecelTime;
|
||||||
detachedMode = "";
|
detachedMode = "";
|
||||||
animCurve = MaterialEasing.emphasized;
|
animCurve = MaterialEasing.emphasized;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user