Skip to content

Commit 849d3ae

Browse files
committed
Merge #453: Change PageStack easing type to InOutCubic
4384896 Change PageStack easing type to InOutCubic (GBKS) Pull request description: See #452 for the problem description, and the [first comment](#452 (comment)) in that thread with the rationale for this change. The current easing type is not supported by QtQuick 2.15. This PR changes the easing type to a supported one that is close to the desired custom bezier curve. I am relying on Github Copilot for the analysis of the problem. Seems correct, but maybe you know something neither me or AI knows. Addresses #452 ACKs for top commit: hebasto: ACK 4384896. Tree-SHA512: 3bfc6a2bbdbd15285cc11a4cb21781c874a42834114674b6151811f53322b9334a5e96d4f6d12594126046bb75e47365e38324102bbd56ba58d223267964a66f
2 parents 320b3d4 + 4384896 commit 849d3ae

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

src/qml/controls/PageStack.qml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,39 +13,35 @@ StackView {
1313
property: vertical ? "y" : "x"
1414
from: vertical ? parent.height : parent.width
1515
to: 0
16-
duration: 400
17-
easing.type: Easing.Bezier
18-
easing.bezierCurve: [0.5, 0.0, 0.2, 1.0]
16+
duration: 500
17+
easing.type: Easing.InOutCubic
1918
}
2019
}
2120
pushExit: Transition {
2221
NumberAnimation {
2322
property: vertical ? "y" : "x"
2423
from: 0
2524
to: vertical ? -parent.height : -parent.width
26-
duration: 400
27-
easing.type: Easing.Bezier
28-
easing.bezierCurve: [0.5, 0.0, 0.2, 1.0]
25+
duration: 500
26+
easing.type: Easing.InOutCubic
2927
}
3028
}
3129
popEnter: Transition {
3230
NumberAnimation {
3331
property: vertical ? "y" : "x"
3432
from: vertical ? -parent.height : -parent.width
3533
to: 0
36-
duration: 400
37-
easing.type: Easing.Bezier
38-
easing.bezierCurve: [0.5, 0.0, 0.2, 1.0]
34+
duration: 500
35+
easing.type: Easing.InOutCubic
3936
}
4037
}
4138
popExit: Transition {
4239
NumberAnimation {
4340
property: vertical ? "y" : "x"
4441
from: 0
4542
to: vertical ? parent.height : parent.width
46-
duration: 400
47-
easing.type: Easing.Bezier
48-
easing.bezierCurve: [0.5, 0.0, 0.2, 1.0]
43+
duration: 500
44+
easing.type: Easing.InOutCubic
4945
}
5046
}
5147
}

0 commit comments

Comments
 (0)