Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
Edje_Edit.h edje_calc.c edje_main.c edje_smart.c edje_text.c
Log Message:
not evas_coord safe! fix. :)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/Edje_Edit.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- Edje_Edit.h 2 Apr 2004 09:16:52 -0000 1.8
+++ Edje_Edit.h 27 Apr 2004 08:16:12 -0000 1.9
@@ -392,9 +392,9 @@
char *part;
int layer;
- double x, y, w, h;
+ Evas_Coord x, y, w, h;
struct {
- double w, h;
+ Evas_Coord w, h;
} min;
unsigned short dirty : 1;
unsigned short recalc : 1;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_calc.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- edje_calc.c 1 Apr 2004 15:32:17 -0000 1.27
+++ edje_calc.c 27 Apr 2004 08:16:13 -0000 1.28
@@ -314,7 +314,7 @@
params->h = desc->rel2.offset_y +
(desc->rel2.relative_y * ed->h) -
params->y + 1;
-
+
/* aspect */
if (params->h > 0)
{
@@ -405,10 +405,10 @@
/* if we have text that wants to make the min size the text size... */
if ((chosen_desc) && (ep->part->type == EDJE_PART_TYPE_TEXT))
{
- char *text;
- char *font;
- int size;
- double tw, th;
+ char *text;
+ char *font;
+ int size;
+ Evas_Coord tw, th;
text = chosen_desc->text.text;
font = chosen_desc->text.font;
@@ -708,9 +708,12 @@
p3.text.align.x = (p1.text.align.x * (1.0 - pos)) + (p2.text.align.x * (pos));
p3.text.align.y = (p1.text.align.y * (1.0 - pos)) + (p2.text.align.y * (pos));
+
}
else
- p3 = p1;
+ {
+ p3 = p1;
+ }
if ((chosen_desc->color_class) && (strlen(chosen_desc->color_class) > 0))
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_main.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- edje_main.c 29 Mar 2004 12:00:01 -0000 1.32
+++ edje_main.c 27 Apr 2004 08:16:13 -0000 1.33
@@ -41,8 +41,8 @@
ed->clipper = evas_object_rectangle_add(ed->evas);
evas_object_smart_member_add(ed->clipper, obj);
evas_object_color_set(ed->clipper, 255, 255, 255, 255);
- evas_object_move(ed->clipper, -1e+8, -1e+8);
- evas_object_resize(ed->clipper, 2e+8, 2e+8);
+ evas_object_move(ed->clipper, -1000000, -1000000);
+ evas_object_resize(ed->clipper, 2000000, 2000000);
evas_object_pass_events_set(ed->clipper, 1);
ed->have_objects = 1;
ed->references = 1;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_smart.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- edje_smart.c 8 Mar 2004 02:43:48 -0000 1.14
+++ edje_smart.c 27 Apr 2004 08:16:13 -0000 1.15
@@ -254,17 +254,16 @@
Evas_Coord ox, oy;
ep = l->data;
- evas_object_geometry_get(ep->object, &ox, &oy, NULL, NULL);
evas_object_move(ep->object, ed->x + ep->x + ep->offset.x, ed->y + ep->y
+ep->offset.y);
if (ep->swallowed_object)
{
- evas_object_geometry_get(ep->swallowed_object, &ox, &oy, NULL, NULL);
evas_object_move(ep->swallowed_object, ed->x + ep->x + ep->offset.x,
ed->y + ep->y +ep->offset.y);
}
if (ep->extra_objects)
{
Evas_List *el;
+ evas_object_geometry_get(ep->object, &ox, &oy, NULL, NULL);
for (el = ep->extra_objects; el; el = el->next)
{
Evas_Object *o;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_text.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- edje_text.c 26 Mar 2004 09:10:05 -0000 1.14
+++ edje_text.c 27 Apr 2004 08:16:13 -0000 1.15
@@ -223,7 +223,6 @@
evas_object_clip_set(o, ep->clip_to->object);
}
}
-
}
}
@@ -543,6 +542,7 @@
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);
+
evas_object_move(ep->object,
ed->x + params->x + ep->offset.x,
ed->y + params->y + ep->offset.y);
-------------------------------------------------------
This SF.net email is sponsored by: The Robotic Monkeys at ThinkGeek
For a limited time only, get FREE Ground shipping on all orders of $35
or more. Hurry up and shop folks, this offer expires April 30th!
http://www.thinkgeek.com/freeshipping/?cpg=12297
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
