Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_calc.c
Log Message:
minw/h didnt let given minw/h for item override text minw/h if the override
is bigger. fix.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_calc.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- edje_calc.c 12 Aug 2004 18:55:45 -0000 1.37
+++ edje_calc.c 25 Aug 2004 12:34:00 -0000 1.38
@@ -541,16 +541,24 @@
evas_object_text_font_set(ep->object, font, size);
if ((chosen_desc->text.min_x) || (chosen_desc->text.min_y))
{
+ int mw, mh;
+
evas_object_text_text_set(ep->object, text);
evas_object_geometry_get(ep->object, NULL, NULL, &tw, &th);
if (chosen_desc->text.min_x)
- minw = tw +
- _edje_text_styles[ep->part->effect].pad.l +
- _edje_text_styles[ep->part->effect].pad.r;
+ {
+ mw = tw +
+ _edje_text_styles[ep->part->effect].pad.l +
+ _edje_text_styles[ep->part->effect].pad.r;
+ if (mw > minw) minw = mw;
+ }
if (chosen_desc->text.min_y)
- minh = th +
- _edje_text_styles[ep->part->effect].pad.t +
- _edje_text_styles[ep->part->effect].pad.b;
+ {
+ mh = th +
+ _edje_text_styles[ep->part->effect].pad.t +
+ _edje_text_styles[ep->part->effect].pad.b;
+ if (mh > minh) minh = mh;
+ }
}
}
/* rememebr what our size is BEFORE we go limit it */
-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
