Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 06:25:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Implements background related discrete animatable properties

Browse source
This commit is contained in:
daisuke 2017-05-29 16:09:20 +09:00
parent 917dbdfdbd
commit d0cf7d65f0
4 changed files with 112 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/style/properties/helpers/animated_properties.mako.rs
View file

@ -349,7 +349,7 @@ impl AnimatedProperty {
AnimatedProperty::${prop.camel_case}(ref from, ref to) => {
// https://w3c.github.io/web-animations/#discrete-animation-type
% if prop.animation_value_type == "discrete":
let value = if progress < 0.5 { *from } else { *to };
let value = if progress < 0.5 { from.clone() } else { to.clone() };
% else:
let value = match from.interpolate(to, progress) {
Ok(value) => value,
@ -591,9 +591,9 @@ impl Animatable for AnimationValue {
&AnimationValue::${prop.camel_case}(ref to)) => {
% if prop.animation_value_type == "discrete":
if self_portion > other_portion {
Ok(AnimationValue::${prop.camel_case}(*from))
Ok(AnimationValue::${prop.camel_case}(from.clone()))
} else {
Ok(AnimationValue::${prop.camel_case}(*to))
Ok(AnimationValue::${prop.camel_case}(to.clone()))
}
% else:
from.add_weighted(to, self_portion, other_portion)