From: Vyacheslav Reutskiy <v.reutskiy@samsung.com>
Date: Thu, 28 Apr 2016 06:30:55 +0000 (+0300)
Subject: edje_text: don't apply ellipsis if fit is setted
X-Git-Tag: upstream/1.20.0~6577
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3749fed463dfdd7aba2d78f3dbc95050a5629977;p=platform%2Fupstream%2Fefl.git

edje_text: don't apply ellipsis if fit is setted

Test plan:

collections {
   group { name: "new";
      parts {
         part { name: "text";
            type: TEXT;
            description { state: "default" 0.0;
               text {
                  text: "Hello world";
                  size: 12;
                  fit: 1 0;
               }
            }
         }
      }
   }
}

Fixes T3519

@fix
---

diff --git a/src/lib/edje/edje_text.c b/src/lib/edje/edje_text.c
index 28f7e7c..e92949c 100644
--- a/src/lib/edje/edje_text.c
+++ b/src/lib/edje/edje_text.c
@@ -133,7 +133,7 @@ _edje_text_fit_x(Edje *ed, Edje_Real_Part *ep,
 
    if (ep->part->scale) evas_object_scale_set(ep->object, TO_DOUBLE(sc));
 
-   evas_obj_text_ellipsis_set(ep->object, chosen_desc->text.min_x ? -1 : params->type.text.ellipsis);
+   evas_obj_text_ellipsis_set(ep->object, (chosen_desc->text.min_x || chosen_desc->text.fit_x) ? -1 : params->type.text.ellipsis);
    efl_text_properties_font_set(ep->object, font, size);
    efl_text_set(ep->object, text);
    efl_gfx_size_set(ep->object, sw, sh);