Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_text.c
Log Message:
noneed for offset since its inside the object now
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_text.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- edje_text.c 26 Nov 2005 08:14:34 -0000 1.44
+++ edje_text.c 26 Nov 2005 13:33:09 -0000 1.45
@@ -279,7 +279,7 @@
char *font, *font2 = NULL;
int size;
Evas_Coord tw, th;
- Evas_Coord ox, oy, sw, sh;
+ Evas_Coord sw, sh;
char font_buf[4096];
int inlined_font = 0, free_text = 0;
@@ -342,9 +342,8 @@
}
{
int l, r, t, b;
+
evas_object_text_style_pad_get(ep->object, &l, &r, &t, &b);
- ox = l;
- oy = t;
sw = params->w - (l + r);
sh = params->h - (t + b);
}
@@ -496,8 +495,8 @@
evas_object_text_font_set(ep->object, font, size);
evas_object_text_text_set(ep->object, text);
evas_object_geometry_get(ep->object, NULL, NULL, &tw, &th);
- ep->offset.x = ox + ((sw - tw) * params->text.align.x);
- ep->offset.y = oy + ((sh - th) * params->text.align.y);
+ ep->offset.x = ((sw - tw) * params->text.align.x);
+ ep->offset.y = ((sh - th) * params->text.align.y);
evas_object_move(ep->object,
ed->x + params->x + ep->offset.x,
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
