timer23
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Vyacheslav Reutskiy 2016-04-28 09:30:55 +03:00
parent df96735657
commit 3749fed463
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/edje/edje_text.c
View File

@ -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);