Zergling_man/moment
Zergling_man/moment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Animation overshoot: support negative values

Browse Source
This commit is contained in:
miruka 2020-07-19 00:37:26 -04:00
parent 88fb71ff34
commit bf1e36031f
6 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/Base/HBox.qml
View File

@ -16,7 +16,7 @@ HFlickableColumnPage {
running: true running: true
from: 0 from: 0
to: 1 to: 1
overshoot: 3 overshoot: 2
} }
Behavior on implicitWidth { HNumberAnimation {} } Behavior on implicitWidth { HNumberAnimation {} }

2
src/gui/Base/HCheckBox.qml
View File

@ -52,7 +52,7 @@ CheckBox {
Behavior on scale { Behavior on scale {
HNumberAnimation { HNumberAnimation {
overshoot: 4 overshoot: 3
easing.type: Easing.InOutBack easing.type: Easing.InOutBack
factor: 0.5 factor: 0.5
} }

13
src/gui/Base/HNumberAnimation.qml
View File

@ -4,10 +4,17 @@ import QtQuick 2.12
NumberAnimation { NumberAnimation {
property real factor: 1.0 property real factor: 1.0
property real overshoot: 1.0 property real overshoot: 0.0
duration: theme.animationDuration * Math.max(overshoot / 1.7, 1.0) * factor duration:
easing.type: overshoot > 1 ? Easing.OutBack : Easing.Linear theme.animationDuration *
Math.max((1 + Math.abs(overshoot)) / 1.7, 1.0) * factor
easing.type:
overshoot > 0 ? Easing.OutBack :
overshoot < 0 ? Easing.InBack :
Easing.Linear
easing.overshoot: overshoot easing.overshoot: overshoot
} }

2
src/gui/Base/HPopup.qml
View File

@ -29,7 +29,7 @@ Popup {
y: (parent.height - height) / 2 y: (parent.height - height) / 2
enter: Transition { enter: Transition {
HNumberAnimation { property: "scale"; from: 0; to: 1; overshoot: 4 } HNumberAnimation { property: "scale"; from: 0; to: 1; overshoot: 3 }
} }
exit: Transition { exit: Transition {

2
src/gui/Base/HTabbedBox.qml
View File

@ -22,7 +22,7 @@ HPage {
running: true running: true
from: 0 from: 0
to: 1 to: 1
overshoot: 3 overshoot: 2
} }
Behavior on implicitWidth { HNumberAnimation {} } Behavior on implicitWidth { HNumberAnimation {} }

2
src/gui/Window.qml
View File

@ -94,6 +94,6 @@ ApplicationWindow {
scale: py.ready ? 1 : 0.5 scale: py.ready ? 1 : 0.5
source: py.ready ? (Qt.application.arguments[1] || "UI.qml") : "" source: py.ready ? (Qt.application.arguments[1] || "UI.qml") : ""
Behavior on scale { HNumberAnimation { overshoot: 5; factor: 1.2 } } Behavior on scale { HNumberAnimation { overshoot: 3; factor: 1.2 } }
} }
} }