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

fixed text fitting on both the x and the y axis 

SVN revision: 13819
This commit is contained in:
tsauerbeck 2005-03-20 22:16:24 +00:00 committed by tsauerbeck
parent cdbe6efc98
commit 0a39ed2865
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
legacy/edje/src/lib/edje_text.c
View File

@ -634,14 +634,23 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
} }
if (chosen_desc->text.fit_y) if (chosen_desc->text.fit_y)
{ {
size = sh; /* if we fit in the x axis, too, size already has a somewhat
* meaningful value, so don't overwrite it with the starting
* value in that case
*/
if (!chosen_desc->text.fit_x) size = sh;
if (inlined_font) evas_object_text_font_source_set(ep->object, ed->path); if (inlined_font) evas_object_text_font_source_set(ep->object, ed->path);
else evas_object_text_font_source_set(ep->object, NULL); else evas_object_text_font_source_set(ep->object, NULL);
evas_object_text_font_set(ep->object, font, size); evas_object_text_font_set(ep->object, font, size);
evas_object_text_text_set(ep->object, text); evas_object_text_text_set(ep->object, text);
evas_object_geometry_get(ep->object, NULL, NULL, &tw, &th); evas_object_geometry_get(ep->object, NULL, NULL, &tw, &th);
if (th < sh)
/* only grow the font size if we didn't already reach the max size
* for the x axis
*/
if (!chosen_desc->text.fit_x && th < sh)
{ {
int dif; int dif;