[EGIT] [core/elementary] master 01/01: Label: better speed/duration calculation.

[davemds]

davemds pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=471c7323fcd43479b1bf28bf3bc513f929590c41

commit 471c7323fcd43479b1bf28bf3bc513f929590c41
Author: davemds <d...@gurumeditation.it>
Date:   Mon Feb 10 22:53:26 2014 +0100

    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.
---
 src/lib/elm_label.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/lib/elm_label.c b/src/lib/elm_label.c
index 96591a4..5b46f3a 100644
--- a/src/lib/elm_label.c
+++ b/src/lib/elm_label.c
@@ -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 =

--