diff options
author | Jean-Philippe Andre <jp.andre@samsung.com> | 2014-05-13 11:22:22 +0900 |
---|---|---|
committer | Jean-Philippe Andre <jp.andre@samsung.com> | 2014-05-13 15:03:16 +0900 |
commit | 8aa078077847ef1e00d3ae474f8d8ae92af1e31a (patch) | |
tree | 12a89db86e950a3f8517a25533e57dd1d74f6ba4 | |
parent | da2929b8f86749321e2bb57bb505dfcbf9447c54 (diff) | |
download | efl-8aa078077847ef1e00d3ae474f8d8ae92af1e31a.tar.gz |
edje_calc: Don't add padding twice to text objectsdevs/jpeg/edc_padding
Text objects declared in Edje will see their padding added twice,
as the Evas_Object_Text itself contains the padding already.
This WILL break some EDC files. It's a bug nonetheless.
Should this be backported?
-rw-r--r-- | src/lib/edje/edje_calc.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c index 3212cdf1a2..58784dd35c 100644 --- a/src/lib/edje/edje_calc.c +++ b/src/lib/edje/edje_calc.c @@ -1478,7 +1478,7 @@ _edje_part_recalc_single_text(FLOAT_T sc EINA_UNUSED, * -- Gustavo Barbieri at 20-Aug-2011 */ { - int tw, th, mw, mh, l, r, t, b, size; + int mw, mh,size; char *sfont = NULL; _edje_text_class_font_get(ed, desc, &size, &sfont); @@ -1492,12 +1492,8 @@ _edje_part_recalc_single_text(FLOAT_T sc EINA_UNUSED, (!chosen_desc->text.max_x) && (!chosen_desc->text.max_y))) return; - eo_do(ep->object, - evas_obj_size_get(&tw, &th), - evas_obj_text_style_pad_get(&l, &r, &t, &b)); - - mw = tw + l + r; - mh = th + t + b; + // Note: No need to add padding to that, it's already in the geometry + eo_do(ep->object, evas_obj_size_get(&mw, &mh)); if (chosen_desc->text.max_x) { |