From a6e612f44e5c8ba2aa05d82fadb8bcca7b2f7aec Mon Sep 17 00:00:00 2001 From: tasn Date: Mon, 11 Jul 2011 16:39:45 +0000 Subject: [PATCH] Evas textblock: Fixed style padding calculation. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@61253 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/canvas/evas_object_textblock.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/lib/canvas/evas_object_textblock.c b/src/lib/canvas/evas_object_textblock.c index b01213c..e9a6698 100644 --- a/src/lib/canvas/evas_object_textblock.c +++ b/src/lib/canvas/evas_object_textblock.c @@ -3105,7 +3105,15 @@ _layout_do_format(const Evas_Object *obj __UNUSED__, Ctxt *c, } } - evas_text_style_pad_get(fmt->style, style_pad_l, style_pad_r, style_pad_t, style_pad_b); + { + Evas_Coord pad_l, pad_r, pad_t, pad_b; + pad_l = pad_r = pad_t = pad_b = 0; + evas_text_style_pad_get(fmt->style, &pad_l, &pad_r, &pad_t, &pad_b); + if (pad_l > *style_pad_l) *style_pad_l = pad_l; + if (pad_r > *style_pad_r) *style_pad_r = pad_r; + if (pad_t > *style_pad_t) *style_pad_t = pad_t; + if (pad_b > *style_pad_b) *style_pad_b = pad_b; + } if (fmt->underline2) c->have_underline2 = 1; -- 2.7.4