forked from enlightenment/efl
Edje text: Remove identical if paths, one is enough.
Thanks to David Seikel. SVN revision: 64689
This commit is contained in:
parent
583a69172f
commit
a6b8ad17af
|
@ -448,7 +448,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
|
|||
evas_object_text_text_set(ep->object, text);
|
||||
part_get_geometry(ep, &tw, &th);
|
||||
/* Find the wanted font size */
|
||||
if ((tw > sw) && (size > 0) && (tw != 0))
|
||||
if ((tw != sw) && (size > 0) && (tw != 0))
|
||||
{
|
||||
size = (size * sw) / tw;
|
||||
|
||||
|
@ -459,17 +459,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
|
|||
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--;
|
||||
|
|
Loading…
Reference in New Issue