From a15987ed6a9f8d93a37bc7bdd9b0323750a81318 Mon Sep 17 00:00:00 2001 From: discomfitor Date: Sat, 31 Jul 2010 05:00:42 +0000 Subject: [PATCH] move a couple variables into loops, reformat slightly to make obvious a redundant variable set git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@50703 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/edje_text.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/src/lib/edje_text.c b/src/lib/edje_text.c index 471befb..aacb73b 100644 --- a/src/lib/edje_text.c +++ b/src/lib/edje_text.c @@ -407,12 +407,9 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep, part_get_geometry(ep, &tw, &th); if (tw > sw) { - int psize; - - psize = size; while ((tw > sw) && (size > 0) && (tw != 0)) { - psize = size; + 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); @@ -426,12 +423,9 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep, } else if (tw < sw) { - int psize; - - psize = size; while ((tw < sw) && (size > 0) && (tw != 0)) { - psize = size; + int psize = size; size = (size * sw) / tw; /* fprintf(stderr, "size = %i (%i, %i)\n", size, sw, tw); */ if ((psize - size) >= 0) size = psize + 1; @@ -498,13 +492,8 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep, { int bottom, top; - if (th < sh) - bottom = 10; - else if (th > sh) - { - bottom = 1; - top = 10; - } + if (th < sh) bottom = 10; + else if (th > sh) bottom = 1; else bottom = 0; /* XXX shut up GCC, th == sh is handled before! */ top = size; -- 2.7.4