dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Label: better speed/duration calculation. 

This fix the speed calculation with slide_short and slide_bounce
animation. Previously the calc was right only for slide_long.
This commit is contained in:
Davide Andreoli 2014-02-10 22:53:26 +01:00
parent b79fe302a0
commit 33cd0f930d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
legacy/elementary/src/lib/elm_label.c
View File

@ -130,15 +130,19 @@ _label_slide_change(Evas_Object *obj)
}
// calculate speed or duration
if (!strcmp(elm_object_style_get(obj), "slide_long"))
w = tb_w + w;
else // slide_short or slide_bounce
w = tb_w - w;
if (sd->use_slide_speed)
{
if (sd->slide_speed <= 0) sd->slide_speed = 1;
sd->slide_duration = (tb_w + w) / sd->slide_speed;
sd->slide_duration = w / sd->slide_speed;
}
else
{
if (sd->slide_duration <= 0) sd->slide_duration = 1;
sd->slide_speed = (tb_w + w) / sd->slide_duration;
sd->slide_speed = w / sd->slide_duration;
}
Edje_Message_Float_Set *msg =