Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_calc.c
Log Message:
missing a style sety when calculating text size... style padding was wrong.
fixed.
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_calc.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -3 -r1.80 -r1.81
--- edje_calc.c 3 Jul 2006 06:15:05 -0000 1.80
+++ edje_calc.c 17 Jul 2006 19:45:38 -0000 1.81
@@ -250,6 +250,7 @@
int minw = 0, minh = 0, maxw = 0, maxh = 0;
flags = FLAG_XY;
+
/* relative coords of top left & bottom right */
if (flags & FLAG_X)
{
@@ -634,7 +635,25 @@
if ((chosen_desc->text.min_x) || (chosen_desc->text.min_y))
{
int mw, mh;
+ Evas_Text_Style_Type style;
+ style = EVAS_TEXT_STYLE_PLAIN;
+ if ((ep->part->effect == EDJE_TEXT_EFFECT_NONE) ||
+ (ep->part->effect == EDJE_TEXT_EFFECT_PLAIN))
+ style = EVAS_TEXT_STYLE_PLAIN;
+ else if (ep->part->effect == EDJE_TEXT_EFFECT_OUTLINE)
+ style = EVAS_TEXT_STYLE_OUTLINE;
+ else if (ep->part->effect == EDJE_TEXT_EFFECT_SOFT_OUTLINE)
+ style = EVAS_TEXT_STYLE_SOFT_OUTLINE;
+ else if (ep->part->effect == EDJE_TEXT_EFFECT_SHADOW)
+ style = EVAS_TEXT_STYLE_SHADOW;
+ else if (ep->part->effect == EDJE_TEXT_EFFECT_SOFT_SHADOW)
+ style = EVAS_TEXT_STYLE_SOFT_SHADOW;
+ else if (ep->part->effect == EDJE_TEXT_EFFECT_OUTLINE_SHADOW)
+ style = EVAS_TEXT_STYLE_OUTLINE_SHADOW;
+ else if (ep->part->effect == EDJE_TEXT_EFFECT_OUTLINE_SOFT_SHADOW)
+ style = EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW;
+ evas_object_text_style_set(ep->object, style);
evas_object_text_text_set(ep->object, text);
evas_object_geometry_get(ep->object, NULL, NULL, &tw, &th);
if (chosen_desc->text.min_x)
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
