edje: restore ellipsis state of TEXT part when marquee mode is NONE 35/140535/2
authorYoungbok Shin <youngb.shin@samsung.com>
Tue, 25 Jul 2017 08:43:15 +0000 (17:43 +0900)
committerYoungbok Shin <youngb.shin@samsung.com>
Wed, 26 Jul 2017 03:06:34 +0000 (03:06 +0000)
@tizen_fix

Change-Id: I7b5458a72b9dc9ebce531ffd5176aeabcfd033c5

src/lib/edje/edje_calc.c

index 020ae5d..5100ce4 100644 (file)
@@ -6302,7 +6302,8 @@ _edje_text_ellipsize_apply(Edje *ed, Edje_Real_Part *ep,
         if (ep->part->type == EDJE_PART_TYPE_TEXTBLOCK)
           evas_object_textblock_ellipsis_set(ep->object, -1.0);
         else if (ep->part->type == EDJE_PART_TYPE_TEXT)
-          evas_object_text_ellipsis_set(ep->object, -1.0);
+          evas_object_text_ellipsis_set(ep->object,
+                                        chosen_desc->text.min_x ? -1.0 : pf->type.text.ellipsis);
 
         return;
      }