Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement #2655 - Add more easing formulas #3812

Merged
merged 11 commits into from
Nov 3, 2023
5 changes: 2 additions & 3 deletions api/cpp/cbindgen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -602,9 +602,8 @@ fn gen_corelib(
" constexpr CachedRenderingData() : cache_index{}, cache_generation{} {}".to_owned(),
);
config.export.body.insert(
"EasingCurve".to_owned(),
" constexpr EasingCurve() : tag(Tag::Linear), cubic_bezier{{0,0,1,1}} {}
constexpr explicit EasingCurve(EasingCurve::Tag tag, float a, float b, float c, float d) : tag(tag), cubic_bezier{{a,b,c,d}} {}".into()
"EasingCurve".to_owned(),
" constexpr EasingCurve(EasingCurve::Tag tag = Tag::Linear , float a = 0, float b = 0, float c = 1, float d = 1) : tag(tag), cubic_bezier{{a,b,c,d}} {}".into()
);
config.export.body.insert(
"LayoutInfo".to_owned(),
Expand Down
49 changes: 43 additions & 6 deletions docs/reference/src/language/syntax/animations.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<!-- Copyright © SixtyFPS GmbH <info@slint.dev> ; SPDX-License-Identifier: MIT -->

# Animations

Declare animations for properties with the `animate` keyword like this:
Expand Down Expand Up @@ -26,17 +27,53 @@ Fine-tune animations using the following parameters:
- `iteration-count`: The number of times a animation should run. A negative value specifies
infinite reruns. Fractual values are possible.
For permanently running animations, see [`animation-tick()`](../builtins/functions.md#animation-tick-duration).
- `easing`: can be `linear`, `ease`, `ease-in`, `ease-out`, `ease-in-out`, `cubic-bezier(a, b, c, d)` as in CSS
- `easing`: can be any of the following. See [`easings.net`](https://easings.net/) for a visual reference:

- `linear`
- `ease-in-quad`
- `ease-out-quad`
- `ease-in-out-quad`
- `ease`
- `ease-in`
- `ease-out`
- `ease-in-out`
- `ease-in-quart`
- `ease-out-quart`
- `ease-in-out-quart`
- `ease-in-quint`
- `ease-out-quint`
- `ease-in-out-quint`
- `ease-in-expo`
- `ease-out-expo`
- `ease-in-out-expo`
- `ease-in-sine`
- `ease-out-sine`
- `ease-in-out-sine`
- `ease-in-back`
- `ease-out-back`
- `ease-in-out-back`
- `ease-in-circ`
- `ease-out-circ`
- `ease-in-out-circ`
- `ease-in-elastic`
- `ease-out-elastic`
- `ease-in-out-elastic`
- `ease-in-bounce`
- `ease-out-bounce`
- `ease-in-out-bounce`
- `cubic-bezier(a, b, c, d)` as in CSS

Easing examples can also be found on the `Easings` tab of the `gallery` example.

It's also possible to animate several properties with the same animation:
It's also possible to animate several properties with the same animation, so:

```slint,ignore
animate x, y { duration: 100ms; }
animate x, y { duration: 100ms; easing: ease-out-bounce; }
```

is the same as
is the same as:

```slint,ignore
animate x { duration: 100ms; }
animate y { duration: 100ms; }
animate x { duration: 100ms; easing: ease-out-bounce; }
animate y { duration: 100ms; easing: ease-out-bounce; }
```
7 changes: 4 additions & 3 deletions examples/gallery/gallery.slint
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: MIT

import { CheckBox, StandardListView, StyleMetrics } from "std-widgets.slint";
import { AboutPage, ControlsPage, ListViewPage, TableViewPage, TableViewPageAdapter, TextEditPage } from "ui/pages/pages.slint";
import { AboutPage, ControlsPage, EasingsPage, ListViewPage, TableViewPage, TableViewPageAdapter, TextEditPage } from "ui/pages/pages.slint";
import { GallerySettings } from "ui/gallery_settings.slint";
import { SideBar } from "ui/side_bar.slint";

Expand All @@ -17,13 +17,14 @@ component App inherits Window {
HorizontalLayout {
side-bar := SideBar {
title: @tr("Slint Widgets Gallery");
model: [@tr("Menu" => "Controls"), @tr("Menu" => "ListView"), @tr("Menu" => "TableView"), @tr("Menu" => "TextEdit"), @tr("Menu" => "About")];
model: [@tr("Menu" => "Controls"), @tr("Menu" => "ListView"), @tr("Menu" => "TableView"), @tr("Menu" => "TextEdit"), @tr("Menu" => "Easings"), @tr("Menu" => "About")];
}

if(side-bar.current-item == 0) : ControlsPage {}
if(side-bar.current-item == 1) : ListViewPage {}
if(side-bar.current-item == 2) : TableViewPage {}
if(side-bar.current-item == 3) : TextEditPage {}
if(side-bar.current-item == 4) : AboutPage {}
if(side-bar.current-item == 4) : EasingsPage {}
if(side-bar.current-item == 5) : AboutPage {}
}
}
160 changes: 160 additions & 0 deletions examples/gallery/ui/pages/easings_page.slint
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
// Copyright © SixtyFPS GmbH <info@slint.dev>
// SPDX-License-Identifier: MIT

import {Page} from "page.slint";
import {Button, HorizontalBox, Slider, ScrollView} from "std-widgets.slint";

component EaseTest inherits HorizontalLayout {
padding: 10px;
spacing: 10px;

in property <string> label: "None";
in property <easing> easing: linear;
in property <int> duration: 1000;

public function animate() {
if (ball.x == 0) {
ball.x = container.width - 16px;
} else {
ball.x = 0;
}
}

Button {
width: 140px;
horizontal-stretch: 0;
text: label; clicked => { root.animate(); }
}

VerticalLayout {
alignment: center;
container := Rectangle {
horizontal-stretch: 1;
height: 4px;
border-radius: 2px;
background: grey;

ball := Rectangle {
x: 0px;
width: 16px;
height: 16px;
border-radius: 5px;
background: blue;
animate x { duration: duration * 1ms; easing: easing; }
}
}
}
}

export component EasingsPage inherits Page {
show-enable-switch: false;
title: "Easings";
description: "Easing demos";

private property <int> curr-duration: 1000;
// Swap to the line below to crash the Rust code generator
// private property <int> curr-duration: slider.value;

Rectangle {
border-radius: 8px;
background: #F4F4F4;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This hardcoded color cause issues in dark mode, so i'll remove it.


VerticalLayout {
padding: 10px;
spacing: 10px;

Button {
text: "Animate All!";
clicked => {
linear-test.animate();
ease-in-quad-test.animate();
ease-out-quad-test.animate();
ease-in-out-quad-test.animate();
ease-test.animate();
ease-in-test.animate();
ease-out-test.animate();
ease-in-out-test.animate();
ease-in-quart-test.animate();
ease-out-quart-test.animate();
ease-in-out-quart-test.animate();
ease-in-quint-test.animate();
ease-out-quint-test.animate();
ease-in-out-quint-test.animate();
ease-in-expo-test.animate();
ease-out-expo-test.animate();
ease-in-out-expo-test.animate();
ease-in-sine-test.animate();
ease-out-sine-test.animate();
ease-in-out-sine-test.animate();
ease-in-back-test.animate();
ease-out-back-test.animate();
ease-in-out-back-test.animate();
ease-in-circ-test.animate();
ease-out-circ-test.animate();
ease-in-out-circ-test.animate();
ease-in-elastic-test.animate();
ease-out-elastic-test.animate();
ease-in-out-elastic-test.animate();
ease-in-bounce-test.animate();
ease-out-bounce-test.animate();
ease-in-out-bounce-test.animate();
}
}

HorizontalLayout {
spacing: 10px;
Text { text: "Duration"; }
slider := Slider { minimum: 100; maximum: 5000; value: 1000; }
Text { text: "" + round(slider.value) + "ms"; }
}
}
}

ScrollView {
VerticalLayout {
padding-right: 10px;

linear-test := EaseTest { label: "linear"; easing: linear; duration: curr-duration; }
ease-in-quad-test := EaseTest { label: "ease-in-quad"; easing: ease-in-quad; duration: curr-duration; }
ease-out-quad-test := EaseTest { label: "ease-out-quad"; easing: ease-out-quad; duration: curr-duration; }
ease-in-out-quad-test := EaseTest { label: "ease-in-out-quad"; easing: ease-in-out-quad; duration: curr-duration; }

ease-test := EaseTest { label: "ease"; easing: ease; duration: curr-duration; }
ease-in-test := EaseTest { label: "ease-in"; easing: ease-in; duration: curr-duration; }
ease-out-test := EaseTest { label: "ease-out"; easing: ease-out; duration: curr-duration; }
ease-in-out-test := EaseTest { label: "ease-in-out"; easing: ease-in-out; duration: curr-duration; }

ease-in-quart-test := EaseTest { label: "ease-in-quart"; easing: ease-in-quart; duration: curr-duration; }
ease-out-quart-test := EaseTest { label: "ease-out-quart"; easing: ease-out-quart; duration: curr-duration; }
ease-in-out-quart-test := EaseTest { label: "ease-in-out-quart"; easing: ease-in-out-quart; duration: curr-duration; }

ease-in-quint-test := EaseTest { label: "ease-in-quint"; easing: ease-in-quint; duration: curr-duration; }
ease-out-quint-test := EaseTest { label: "ease-out-quint"; easing: ease-out-quint; duration: curr-duration; }
ease-in-out-quint-test := EaseTest { label: "ease-in-out-quint"; easing: ease-in-out-quint; duration: curr-duration; }

ease-in-expo-test := EaseTest { label: "ease-in-expo"; easing: ease-in-expo; duration: curr-duration; }
ease-out-expo-test := EaseTest { label: "ease-out-expo"; easing: ease-out-expo; duration: curr-duration; }
ease-in-out-expo-test := EaseTest { label: "ease-in-out-expo"; easing: ease-in-out-expo; duration: curr-duration; }

ease-in-sine-test := EaseTest { label: "ease-in-sine"; easing: ease-in-sine; duration: curr-duration; }
ease-out-sine-test := EaseTest { label: "ease-out-sine"; easing: ease-out-sine; duration: curr-duration; }
ease-in-out-sine-test := EaseTest { label: "ease-in-out-sine"; easing: ease-in-out-sine; duration: curr-duration; }

ease-in-back-test := EaseTest { label: "ease-in-back"; easing: ease-in-back; duration: curr-duration; }
ease-out-back-test := EaseTest { label: "ease-out-back"; easing: ease-out-back; duration: curr-duration; }
ease-in-out-back-test := EaseTest { label: "ease-in-out-back"; easing: ease-in-out-back; duration: curr-duration; }

ease-in-circ-test := EaseTest { label: "ease-in-circ"; easing: ease-in-circ; duration: curr-duration; }
ease-out-circ-test := EaseTest { label: "ease-out-circ"; easing: ease-out-circ; duration: curr-duration; }
ease-in-out-circ-test := EaseTest { label: "ease-in-out-circ"; easing: ease-in-out-circ; duration: curr-duration; }

ease-in-elastic-test := EaseTest { label: "ease-in-elastic"; easing: ease-in-elastic; duration: curr-duration; }
ease-out-elastic-test := EaseTest { label: "ease-out-elastic"; easing: ease-out-elastic; duration: curr-duration; }
ease-in-out-elastic-test := EaseTest { label: "ease-in-out-elastic"; easing: ease-in-out-elastic; duration: curr-duration; }

ease-in-bounce-test := EaseTest { label: "ease-in-bounce"; easing: ease-in-bounce; duration: curr-duration; }
ease-out-bounce-test := EaseTest { label: "ease-out-bounce"; easing: ease-out-bounce; duration: curr-duration; }
ease-in-out-bounce-test := EaseTest { label: "ease-in-out-bounce"; easing: ease-in-out-bounce; duration: curr-duration; }
}
}
}
7 changes: 4 additions & 3 deletions examples/gallery/ui/pages/page.slint
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ import { Switch, GridBox, ListView, ScrollView, VerticalBox } from "std-widgets.
import { GallerySettings } from "../gallery_settings.slint";

export component Page inherits VerticalBox {
in property <string> title: "title";
in property <string> description: "description";
in property<string> title: "title";
in property<string> description: "description";
in property<bool> show-enable-switch: true;

HorizontalLayout {
height: 24px;
Expand All @@ -20,7 +21,7 @@ export component Page inherits VerticalBox {
// Spacer
Rectangle {}

Switch {
if show-enable-switch: Switch {
horizontal-stretch: 0;
text: @tr("Widgets enabled");
checked <=> GallerySettings.widgets-enabled;
Expand Down
3 changes: 2 additions & 1 deletion examples/gallery/ui/pages/pages.slint
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@

import { AboutPage } from "about_page.slint";
import { ControlsPage } from "controls_page.slint";
import { EasingsPage } from "easings_page.slint";
import { ListViewPage } from "list_view_page.slint";
import { TableViewPage, TableViewPageAdapter } from "table_view_page.slint";
import { TextEditPage } from "text_edit_page.slint";

export { AboutPage, ControlsPage, ListViewPage, TextEditPage, TableViewPage, TableViewPageAdapter }
export { AboutPage, ControlsPage, EasingsPage, ListViewPage, TextEditPage, TableViewPage, TableViewPageAdapter }
6 changes: 6 additions & 0 deletions internal/compiler/expression_tree.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1476,6 +1476,12 @@ pub enum EasingCurve {
#[default]
Linear,
CubicBezier(f32, f32, f32, f32),
EaseInElastic,
EaseOutElastic,
EaseInOutElastic,
EaseInBounce,
EaseOutBounce,
EaseInOutBounce,
// CubicBezierNonConst([Box<Expression>; 4]),
// Custom(Box<dyn Fn(f32)->f32>),
}
Expand Down
6 changes: 6 additions & 0 deletions internal/compiler/generator/cpp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2821,6 +2821,12 @@ fn compile_expression(expr: &llr::Expression, ctx: &EvaluationContext) -> String
"slint::cbindgen_private::EasingCurve(slint::cbindgen_private::EasingCurve::Tag::CubicBezier, {}, {}, {}, {})",
a, b, c, d
),
Expression::EasingCurve(EasingCurve::EaseInElastic) => "slint::cbindgen_private::EasingCurve::Tag::EaseInElastic".into(),
Expression::EasingCurve(EasingCurve::EaseOutElastic) => "slint::cbindgen_private::EasingCurve::Tag::EaseOutElastic".into(),
Expression::EasingCurve(EasingCurve::EaseInOutElastic) => "slint::cbindgen_private::EasingCurve::Tag::EaseInOutElastic".into(),
Expression::EasingCurve(EasingCurve::EaseInBounce) => "slint::cbindgen_private::EasingCurve::Tag::EaseInBounce".into(),
Expression::EasingCurve(EasingCurve::EaseOutBounce) => "slint::cbindgen_private::EasingCurve::Tag::EaseOutElastic".into(),
Expression::EasingCurve(EasingCurve::EaseInOutBounce) => "slint::cbindgen_private::EasingCurve::Tag::EaseInOutElastic".into(),
Expression::LinearGradient{angle, stops} => {
let angle = compile_expression(angle, ctx);
let mut stops_it = stops.iter().map(|(color, stop)| {
Expand Down
18 changes: 18 additions & 0 deletions internal/compiler/generator/rust.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2192,6 +2192,24 @@ fn compile_expression(expr: &Expression, ctx: &EvaluationContext) -> TokenStream
Expression::EasingCurve(EasingCurve::CubicBezier(a, b, c, d)) => {
quote!(sp::EasingCurve::CubicBezier([#a, #b, #c, #d]))
}
Expression::EasingCurve(EasingCurve::EaseInElastic) => {
quote!(sp::EasingCurve::EaseInElastic)
}
Expression::EasingCurve(EasingCurve::EaseOutElastic) => {
quote!(sp::EasingCurve::EaseOutElastic)
}
Expression::EasingCurve(EasingCurve::EaseInOutElastic) => {
quote!(sp::EasingCurve::EaseInOutElastic)
}
Expression::EasingCurve(EasingCurve::EaseInBounce) => {
quote!(sp::EasingCurve::EaseInBounce)
}
Expression::EasingCurve(EasingCurve::EaseOutBounce) => {
quote!(sp::EasingCurve::EaseOutBounce)
}
Expression::EasingCurve(EasingCurve::EaseInOutBounce) => {
quote!(sp::EasingCurve::EaseInOutBounce)
}
Expression::LinearGradient { angle, stops } => {
let angle = compile_expression(angle, ctx);
let stops = stops.iter().map(|(color, stop)| {
Expand Down