From 6ea23d2c54ca9265efa5bdf2995eb7632b1d3fda Mon Sep 17 00:00:00 2001 From: Youngbok Shin Date: Fri, 18 Aug 2017 17:49:58 +0900 Subject: [PATCH] edje: move Text, Textblock object based on its original position in smart move @tizen_fix Change-Id: I07871d49e9384bc3067e6036c0762352e02044b5 --- src/lib/edje/edje_calc.c | 1 + src/lib/edje/edje_smart.c | 21 ++++++--------------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c index c640be9..82bb53a 100644 --- a/src/lib/edje/edje_calc.c +++ b/src/lib/edje/edje_calc.c @@ -5385,6 +5385,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta * 20170802: remove build warnings caused by unused parameter or variable. * 20170804: add text marquee speed set/get APIs for internal usages. * 20170804: fixed top-aligned issue when marquee is started. + * 20170818: move Text, Textblock object based on its original position in smart move * **********************************************************************************/ #define EDJE_DEFAULT_FADE_IMAGE "edje_default_fade_image.png" diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c index cfd028b..272c79d 100644 --- a/src/lib/edje/edje_smart.c +++ b/src/lib/edje/edje_smart.c @@ -149,23 +149,14 @@ _edje_object_text_ellipsize_clipper_move(Edje *ed, Edje_Real_Part *ep, Evas_Coor { Evas_Coord x = 0, y = 0; - if (ep->typedata.text->ellipsize.marquee.animator) - { - evas_object_geometry_get(ep->object, &x, &y, NULL, NULL); + evas_object_geometry_get(ep->object, &x, &y, NULL, NULL); - /* Horizontal Case */ - x += ed_diff.x; - y += ed_diff.y; + x += ed_diff.x; + y += ed_diff.y; - /* ed_diff should be handled because of horizontal scroll */ - ep->typedata.text->ellipsize.marquee.orig_x += ed_diff.x; - ep->typedata.text->ellipsize.marquee.orig_y += ed_diff.y; - } - else - { - x = ed->x + ep->x + ep->typedata.text->offset.x; - y = ed->y + ep->y + ep->typedata.text->offset.y; - } + /* ed_diff should be handled because of marquee */ + ep->typedata.text->ellipsize.marquee.orig_x += ed_diff.x; + ep->typedata.text->ellipsize.marquee.orig_y += ed_diff.y; if (ep->typedata.text->ellipsize.marquee.proxy_obj) { -- 2.7.4