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

Edje text: Fixed a bug with fit_x and cleaned everything up. 

There was a bug that cause bad sizing (by 1pt) when fit was set, this is
now fixed.
Furthermore, for some reason we had a loop although we already jumped
to the last value right at the start. That didn't make any sense,
so I removed that as well.

SVN revision: 57394
This commit is contained in:
Tom Hacohen 2011-02-27 18:09:00 +00:00
parent a19a9010df
commit 54f4d4bf2f
1 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -428,39 +428,32 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
evas_object_text_font_set(ep->object, font, size);
evas_object_text_text_set(ep->object, text);
part_get_geometry(ep, &tw, &th);
if (tw > sw)
{
while ((tw > sw) && (size > 0) && (tw != 0))
{
int psize = size;
size = (size * sw) / tw;
if ((psize - size) <= 0) size = psize - 1;
if (inlined_font) evas_object_text_font_source_set(ep->object, ed->path);
else evas_object_text_font_source_set(ep->object, NULL);
/* Find the wanted font size */
if ((tw > sw) && (size > 0) && (tw != 0))
{
size = (size * sw) / tw;
if (ep->part->scale) evas_object_scale_set(ep->object, TO_DOUBLE(sc));
evas_object_text_font_set(ep->object, font, size);
part_get_geometry(ep, &tw, &th);
if ((size > 0) && (tw == 0)) break;
}
}
else if (tw < sw)
{
while ((tw < sw) && (size > 0) && (tw != 0))
{
int psize = size;
size = (size * sw) / tw;
/* fprintf(stderr, "size = %i (%i, %i)\n", size, sw, tw); */
if ((psize - size) >= 0) size = psize + 1;
if (inlined_font) evas_object_text_font_source_set(ep->object, ed->path);
else evas_object_text_font_source_set(ep->object, NULL);
if (inlined_font) evas_object_text_font_source_set(ep->object, ed->path);
else evas_object_text_font_source_set(ep->object, NULL);
if (ep->part->scale) evas_object_scale_set(ep->object, TO_DOUBLE(sc));
evas_object_text_font_set(ep->object, font, size);
part_get_geometry(ep, &tw, &th);
if ((size > 0) && (tw == 0)) break;
}
if (ep->part->scale) evas_object_scale_set(ep->object, TO_DOUBLE(sc));
evas_object_text_font_set(ep->object, font, size);
part_get_geometry(ep, &tw, &th);
}
else if ((tw < sw) && (size > 0) && (tw != 0))
{
size = (size * sw) / tw;
if (inlined_font) evas_object_text_font_source_set(ep->object, ed->path);
else evas_object_text_font_source_set(ep->object, NULL);
if (ep->part->scale) evas_object_scale_set(ep->object, TO_DOUBLE(sc));
evas_object_text_font_set(ep->object, font, size);
part_get_geometry(ep, &tw, &th);
}
/* FIXME: This should possibly be replaced by more proper handling,
* but it's still way better than what was here before. */
if (tw > sw) size--;
}
if (chosen_desc->text.fit_y && (ep->text.cache.in_str && eina_stringshare_strlen(ep->text.cache.in_str) > 0))
{