edje - and make logic right for no elipsis with min.x too
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>
Thu, 14 Aug 2014 16:36:14 +0000 (01:36 +0900)
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>
Thu, 14 Aug 2014 16:36:14 +0000 (01:36 +0900)
src/lib/edje/edje_text.c

index 65f691b..70392e5 100644 (file)
@@ -92,7 +92,7 @@ _edje_text_fit_x(Edje *ed, Edje_Real_Part *ep,
    *free_text = 0;
    if (sw <= 1) return "";
 
-   if ((params->type.text.ellipsis < 0) && (!chosen_desc->text.min_x))
+   if ((params->type.text.ellipsis < 0) || (chosen_desc->text.min_x))
      return text;
 
    if (ep->part->scale) evas_object_scale_set(ep->object, TO_DOUBLE(sc));