From 63b22447efddfd01bf5fc6087a2710b34a205463 Mon Sep 17 00:00:00 2001 From: Sebastian Dransfeld Date: Mon, 18 Jun 2007 16:48:43 +0000 Subject: [PATCH] Remove padding when searching for character position. SVN revision: 30392 --- legacy/edje/src/lib/edje_text.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/legacy/edje/src/lib/edje_text.c b/legacy/edje/src/lib/edje_text.c index e1f931241c..dab43d2de6 100644 --- a/legacy/edje/src/lib/edje_text.c +++ b/legacy/edje/src/lib/edje_text.c @@ -156,6 +156,7 @@ _edje_text_fit_x(Edje *ed, Edje_Real_Part *ep, Evas_Coord sw, int *free_text) { Evas_Coord tw = 0, th = 0, p; + int l, r; char *buf; int c1 = -1, c2 = -1, loop = 0, extra; size_t orig_len; @@ -166,6 +167,7 @@ _edje_text_fit_x(Edje *ed, Edje_Real_Part *ep, evas_object_text_text_set(ep->object, text); part_get_geometry(ep, &tw, &th); + evas_object_text_style_pad_get(ep->object, &l, &r, NULL, NULL); p = ((sw - tw) * params->text.elipsis); @@ -174,12 +176,12 @@ _edje_text_fit_x(Edje *ed, Edje_Real_Part *ep, { if (params->text.elipsis != 0.0) c1 = evas_object_text_char_coords_get(ep->object, - -p, th / 2, + -p + l, th / 2, NULL, NULL, NULL, NULL); if (params->text.elipsis != 1.0) c2 = evas_object_text_char_coords_get(ep->object, - -p + sw, th / 2, - NULL, NULL, NULL, NULL); + -p + sw - r, th / 2, + NULL, NULL, N*ULL, NULL); if ((c1 < 0) && (c2 < 0)) { c1 = 0; @@ -447,7 +449,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep, dif = (th - sh) / 4; if (dif < 1) dif = 1; - while ((th > sh) && (sw >= 0.0)) + while ((th > sh) && (sw >= 0)) { size -= dif; if (size <= 0) break;