Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
Edje.h edje_calc.c edje_callbacks.c edje_smart.c edje_text.c
edje_util.c
Log Message:
match changes made to evas.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/Edje.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- Edje.h 29 Sep 2003 20:43:37 -0000 1.20
+++ Edje.h 18 Oct 2003 03:34:54 -0000 1.21
@@ -22,8 +22,8 @@
void edje_file_collection_list_free (Evas_List *lst);
char *edje_file_data_get (const char *file, const char *key);
- void edje_extern_object_min_size_set (Evas_Object *obj, double minw,
double minh);
- void edje_extern_object_max_size_set (Evas_Object *obj, double maxw,
double maxh);
+ void edje_extern_object_min_size_set (Evas_Object *obj, Evas_Coord minw,
Evas_Coord minh);
+ void edje_extern_object_max_size_set (Evas_Object *obj, Evas_Coord maxw,
Evas_Coord maxh);
Evas_Object *edje_object_add (Evas *evas);
const char *edje_object_data_get (Evas_Object *obj, const char *key);
@@ -39,12 +39,12 @@
int edje_object_freeze (Evas_Object *o);
int edje_object_thaw (Evas_Object *o);
void edje_object_color_class_set (Evas_Object *o, const char
*color_class, int r, int g, int b, int a, int r2, int g2, int b2, int a2, int r3, int
g3, int b3, int a3);
- void edje_object_text_class_set (Evas_Object *o, const char
*text_class, const char *font, double size);
- void edje_object_size_min_get (Evas_Object *o, double *minw, double
*minh);
- void edje_object_size_max_get (Evas_Object *o, double *maxw, double
*maxh);
- void edje_object_size_min_calc (Evas_Object *o, double *minw, double
*minh);
+ void edje_object_text_class_set (Evas_Object *o, const char
*text_class, const char *font, Evas_Font_Size size);
+ void edje_object_size_min_get (Evas_Object *o, Evas_Coord *minw,
Evas_Coord *minh);
+ void edje_object_size_max_get (Evas_Object *o, Evas_Coord *maxw,
Evas_Coord *maxh);
+ void edje_object_size_min_calc (Evas_Object *o, Evas_Coord *minw,
Evas_Coord *minh);
int edje_object_part_exists (Evas_Object *o, const char *part);
- void edje_object_part_geometry_get (Evas_Object *o, const char *part,
double *x, double *y, double *w, double *h);
+ void edje_object_part_geometry_get (Evas_Object *o, const char *part,
Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
void edje_object_part_text_set (Evas_Object *o, const char *part,
const char *text);
const char *edje_object_part_text_get (Evas_Object *o, const char *part);
void edje_object_part_swallow (Evas_Object *o, const char *part,
Evas_Object *o_swallow);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_calc.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- edje_calc.c 7 Sep 2003 05:16:08 -0000 1.16
+++ edje_calc.c 18 Oct 2003 03:34:54 -0000 1.17
@@ -599,7 +599,12 @@
double pos = 0.0;
if (ep->calculated) return;
- if (ep->calculating) return;
+ if (ep->calculating)
+ {
+ printf("EDJE ERROR: circular dependancy when calculating part \"%s\"\n",
+ ep->part->name);
+ return;
+ }
ep->calculating = 1;
if (ep->param1.rel1_to_x) _edje_part_recalc(ed, ep->param1.rel1_to_x);
if (ep->param1.rel1_to_y) _edje_part_recalc(ed, ep->param1.rel1_to_y);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_callbacks.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- edje_callbacks.c 12 Sep 2003 08:09:47 -0000 1.10
+++ edje_callbacks.c 18 Oct 2003 03:34:54 -0000 1.11
@@ -141,7 +141,7 @@
if (!rp) return;
if (rp->still_in)
{
- double x, y, w, h;
+ Evas_Coord x, y, w, h;
evas_object_geometry_get(obj, &x, &y, &w, &h);
if ((ev->cur.canvas.x < x) || (ev->cur.canvas.y < y) ||
@@ -150,7 +150,7 @@
}
else
{
- double x, y, w, h;
+ Evas_Coord x, y, w, h;
evas_object_geometry_get(obj, &x, &y, &w, &h);
if ((ev->cur.canvas.x >= x) && (ev->cur.canvas.y >= y) &&
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_smart.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- edje_smart.c 26 Aug 2003 00:16:49 -0000 1.10
+++ edje_smart.c 18 Oct 2003 03:34:54 -0000 1.11
@@ -8,8 +8,8 @@
static void _edje_smart_lower(Evas_Object * obj);
static void _edje_smart_stack_above(Evas_Object * obj, Evas_Object * above);
static void _edje_smart_stack_below(Evas_Object * obj, Evas_Object * below);
-static void _edje_smart_move(Evas_Object * obj, double x, double y);
-static void _edje_smart_resize(Evas_Object * obj, double w, double h);
+static void _edje_smart_move(Evas_Object * obj, Evas_Coord x, Evas_Coord y);
+static void _edje_smart_resize(Evas_Object * obj, Evas_Coord w, Evas_Coord h);
static void _edje_smart_show(Evas_Object * obj);
static void _edje_smart_hide(Evas_Object * obj);
static void _edje_smart_color_set(Evas_Object * obj, int r, int g, int b, int a);
@@ -237,11 +237,11 @@
}
static void
-_edje_smart_move(Evas_Object * obj, double x, double y)
+_edje_smart_move(Evas_Object * obj, Evas_Coord x, Evas_Coord y)
{
Edje *ed;
Evas_List *l;
- double xx, yy;
+ Evas_Coord xx, yy;
ed = evas_object_smart_data_get(obj);
if (!ed) return;
@@ -253,7 +253,7 @@
for (l = ed->parts; l; l = l->next)
{
Edje_Real_Part *ep;
- double ox, oy;
+ Evas_Coord ox, oy;
ep = l->data;
evas_object_geometry_get(ep->object, &ox, &oy, NULL, NULL);
@@ -270,7 +270,7 @@
for (el = ep->extra_objects; el; el = el->next)
{
Evas_Object *o;
- double oox, ooy;
+ Evas_Coord oox, ooy;
o = el->data;
evas_object_geometry_get(o, &oox, &ooy, NULL, NULL);
@@ -282,7 +282,7 @@
}
static void
-_edje_smart_resize(Evas_Object * obj, double w, double h)
+_edje_smart_resize(Evas_Object * obj, Evas_Coord w, Evas_Coord h)
{
Edje *ed;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_text.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- edje_text.c 16 Jul 2003 05:15:15 -0000 1.4
+++ edje_text.c 18 Oct 2003 03:34:54 -0000 1.5
@@ -235,8 +235,8 @@
char *text;
char *font;
int size;
- double tw, th;
- double ox, oy, sw, sh;
+ Evas_Coord tw, th;
+ Evas_Coord ox, oy, sw, sh;
char *buf = NULL;
text = chosen_desc->text.text;
@@ -319,12 +319,10 @@
if (th < sh)
{
int dif;
- double change;
dif = (th - sh) / 4;
if (dif < 1) dif = 1;
- change = 0;
- while ((th < sh) && (sw > 0.0))
+ while ((th < sh) && (sw > 0))
{
size += dif;
evas_object_text_font_set(ep->object, font, size);
@@ -351,7 +349,7 @@
if (size < 1) size = 1;
if (!chosen_desc->text.fit_x)
{
- double p;
+ Evas_Coord p;
int c1, c2;
int loop;
int orig_len;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_util.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- edje_util.c 12 Sep 2003 08:09:47 -0000 1.24
+++ edje_util.c 18 Oct 2003 03:34:54 -0000 1.25
@@ -130,7 +130,7 @@
}
void
-edje_object_text_class_set(Evas_Object *obj, const char *text_class, const char
*font, double size)
+edje_object_text_class_set(Evas_Object *obj, const char *text_class, const char
*font, Evas_Font_Size size)
{
Edje *ed;
Evas_List *l;
@@ -189,7 +189,7 @@
}
void
-edje_object_part_geometry_get(Evas_Object *obj, const char *part, double *x, double
*y, double *w, double *h )
+edje_object_part_geometry_get(Evas_Object *obj, const char *part, Evas_Coord *x,
Evas_Coord *y, Evas_Coord *w, Evas_Coord *h )
{
Evas_List *l;
Edje *ed;
@@ -295,7 +295,7 @@
rp->swallow_params.max.h = -1;
if ((type) && (!strcmp(type, "edje")))
{
- double w, h;
+ Evas_Coord w, h;
edje_object_size_min_get(obj_swallow, &w, &h);
rp->swallow_params.min.w = w;
@@ -308,7 +308,7 @@
(!strcmp(type, "polygon")) ||
(!strcmp(type, "line"))))
{
- double w, h;
+ Evas_Coord w, h;
evas_object_geometry_get(obj_swallow, NULL, NULL, &w, &h);
rp->swallow_params.min.w = w;
@@ -333,7 +333,7 @@
}
void
-edje_extern_object_min_size_set(Evas_Object *obj, double minw, double minh)
+edje_extern_object_min_size_set(Evas_Object *obj, Evas_Coord minw, Evas_Coord minh)
{
int mw, mh;
@@ -352,7 +352,7 @@
}
void
-edje_extern_object_max_size_set(Evas_Object *obj, double maxw, double maxh)
+edje_extern_object_max_size_set(Evas_Object *obj, Evas_Coord maxw, Evas_Coord maxh)
{
int mw, mh;
@@ -411,7 +411,7 @@
}
void
-edje_object_size_min_get(Evas_Object *obj, double *minw, double *minh)
+edje_object_size_min_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
{
Edje *ed;
@@ -427,7 +427,7 @@
}
void
-edje_object_size_max_get(Evas_Object *obj, double *maxw, double *maxh)
+edje_object_size_max_get(Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh)
{
Edje *ed;
@@ -457,10 +457,10 @@
}
void
-edje_object_size_min_calc(Evas_Object *obj, double *minw, double *minh)
+edje_object_size_min_calc(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
{
Edje *ed;
- double pw, ph;
+ Evas_Coord pw, ph;
int maxw, maxh;
int ok;
-------------------------------------------------------
This SF.net email sponsored by: Enterprise Linux Forum Conference & Expo
The Event For Linux Datacenter Solutions & Strategies in The Enterprise
Linux in the Boardroom; in the Front Office; & in the Server Room
http://www.enterpriselinuxforum.com
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
