Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_container.c edje_private.h edje_smart.c edje_text.c
edje_util.c
Log Message:
the first wave of evas smart object modes. commit hell #1. :) other things
still need updating in cvs - but i am sure others can do that :)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_container.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- edje_container.c 21 Sep 2005 03:11:31 -0000 1.9
+++ edje_container.c 27 Oct 2005 02:44:36 -0000 1.10
@@ -725,11 +725,6 @@
static void _smart_init(void);
static void _smart_add(Evas_Object * obj);
static void _smart_del(Evas_Object * obj);
-static void _smart_layer_set(Evas_Object * obj, int layer);
-static void _smart_raise(Evas_Object * obj);
-static void _smart_lower(Evas_Object * obj);
-static void _smart_stack_above(Evas_Object * obj, Evas_Object * above);
-static void _smart_stack_below(Evas_Object * obj, Evas_Object * below);
static void _smart_move(Evas_Object * obj, Evas_Coord x, Evas_Coord y);
static void _smart_resize(Evas_Object * obj, Evas_Coord w, Evas_Coord h);
static void _smart_show(Evas_Object * obj);
@@ -757,11 +752,7 @@
smart = evas_smart_new(E_OBJ_NAME,
_smart_add,
_smart_del,
- _smart_layer_set,
- _smart_raise,
- _smart_lower,
- _smart_stack_above,
- _smart_stack_below,
+ NULL, NULL, NULL, NULL, NULL,
_smart_move,
_smart_resize,
_smart_show,
@@ -797,56 +788,6 @@
}
static void
-_smart_layer_set(Evas_Object *obj, int layer)
-{
- Smart_Data *sd;
-
- sd = evas_object_smart_data_get(obj);
- if (!sd) return;
-// evas_object_layer_set(sd->obj, layer);
-}
-
-static void
-_smart_raise(Evas_Object *obj)
-{
- Smart_Data *sd;
-
- sd = evas_object_smart_data_get(obj);
- if (!sd) return;
-// evas_object_raise(sd->obj);
-}
-
-static void
-_smart_lower(Evas_Object *obj)
-{
- Smart_Data *sd;
-
- sd = evas_object_smart_data_get(obj);
- if (!sd) return;
-// evas_object_lower(sd->obj);
-}
-
-static void
-_smart_stack_above(Evas_Object *obj, Evas_Object *above)
-{
- Smart_Data *sd;
-
- sd = evas_object_smart_data_get(obj);
- if (!sd) return;
-// evas_object_stack_above(sd->obj, above);
-}
-
-static void
-_smart_stack_below(Evas_Object *obj, Evas_Object *below)
-{
- Smart_Data *sd;
-
- sd = evas_object_smart_data_get(obj);
- if (!sd) return;
-// evas_object_stack_below(sd->obj, below);
-}
-
-static void
_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
{
Smart_Data *sd;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_private.h,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -3 -r1.93 -r1.94
--- edje_private.h 5 Oct 2005 08:38:04 -0000 1.93
+++ edje_private.h 27 Oct 2005 02:44:36 -0000 1.94
@@ -457,7 +457,6 @@
char *path;
char *part;
- int layer;
Evas_Coord x, y, w, h;
struct {
Evas_Coord w, h;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_smart.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- edje_smart.c 1 Oct 2005 04:15:15 -0000 1.22
+++ edje_smart.c 27 Oct 2005 02:44:36 -0000 1.23
@@ -3,13 +3,6 @@
static void _edje_smart_add(Evas_Object * obj);
static void _edje_smart_del(Evas_Object * obj);
-static void _edje_smart_layer_set(Evas_Object * obj, int layer);
-static void _edje_smart_raise(Evas_Object * obj);
-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 Evas_Object *_edje_smart_above_get(Evas_Object * obj);
-static Evas_Object *_edje_smart_below_get(Evas_Object * obj);
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);
@@ -39,11 +32,7 @@
_edje_smart = evas_smart_new("edje",
_edje_smart_add,
_edje_smart_del,
- _edje_smart_layer_set,
- _edje_smart_raise,
- _edje_smart_lower,
- _edje_smart_stack_above,
- _edje_smart_stack_below,
+ NULL, NULL, NULL, NULL, NULL,
_edje_smart_move,
_edje_smart_resize,
_edje_smart_show,
@@ -52,8 +41,6 @@
_edje_smart_clip_set,
_edje_smart_clip_unset,
NULL);
- evas_smart_above_get_set(_edje_smart, _edje_smart_above_get);
- evas_smart_below_get_set(_edje_smart, _edje_smart_below_get);
}
return evas_object_smart_add(evas, _edje_smart);
}
@@ -86,204 +73,6 @@
_edje_unref(ed);
}
-static void
-_edje_smart_layer_set(Evas_Object * obj, int layer)
-{
- Edje *ed;
- Evas_List *l;
-
- ed = evas_object_smart_data_get(obj);
- if (!ed) return;
- if (ed->layer == layer) return;
- ed->layer = layer;
- for (l = ed->parts; l; l = l->next)
- {
- Edje_Real_Part *ep;
-
- ep = l->data;
- if (ep->extra_objects)
- {
- Evas_List *el;
-
- for (el = ep->extra_objects; el; el = el->next)
- {
- Evas_Object *o;
-
- o = el->data;
- evas_object_layer_set(o, ed->layer);
- }
- }
- evas_object_layer_set(ep->object, ed->layer);
- if (ep->swallowed_object)
- evas_object_layer_set(ep->swallowed_object, ed->layer);
- }
- _edje_emit(ed, "layer,set", "");
-}
-
-static void
-_edje_smart_raise(Evas_Object * obj)
-{
- Edje *ed;
- Evas_List *l;
-
- ed = evas_object_smart_data_get(obj);
- if (!ed) return;
- for (l = ed->parts; l; l = l->next)
- {
- Edje_Real_Part *ep;
-
- ep = l->data;
- if (ep->extra_objects)
- {
- Evas_List *el;
-
- for (el = ep->extra_objects; el; el = el->next)
- {
- Evas_Object *o;
-
- o = el->data;
- evas_object_raise(o);
- }
- }
- evas_object_raise(ep->object);
- if (ep->swallowed_object)
- evas_object_raise(ep->swallowed_object);
- }
- _edje_emit(ed, "raise", "");
-}
-
-static void
-_edje_smart_lower(Evas_Object * obj)
-{
- Edje *ed;
- Evas_List *l;
-
- ed = evas_object_smart_data_get(obj);
- if (!ed) return;
- for (l = evas_list_last(ed->parts); l; l = l->prev)
- {
- Edje_Real_Part *ep;
-
- ep = l->data;
- if (ep->swallowed_object)
- evas_object_lower(ep->swallowed_object);
- evas_object_lower(ep->object);
- if (ep->extra_objects)
- {
- Evas_List *el;
-
- for (el = ep->extra_objects; el; el = el->next)
- {
- Evas_Object *o;
-
- o = el->data;
- evas_object_lower(o);
- }
- }
- }
- _edje_emit(ed, "lower", "");
-}
-
-static void
-_edje_smart_stack_above(Evas_Object * obj, Evas_Object * above)
-{
- Edje *ed;
- Evas_List *l;
-
- ed = evas_object_smart_data_get(obj);
- if (!ed) return;
- for (l = evas_list_last(ed->parts); l; l = l->prev)
- {
- Edje_Real_Part *ep;
-
- ep = l->data;
- if (ep->swallowed_object)
- evas_object_stack_above(ep->swallowed_object, above);
- evas_object_stack_above(ep->object, above);
- if (ep->extra_objects)
- {
- Evas_List *el;
-
- for (el = evas_list_last(ep->extra_objects); el; el = el->prev)
- {
- Evas_Object *o;
-
- o = el->data;
- evas_object_stack_above(o, above);
- }
- }
- }
- _edje_emit(ed, "stack_above", "");
-}
-
-static void
-_edje_smart_stack_below(Evas_Object * obj, Evas_Object * below)
-{
- Edje *ed;
- Evas_List *l;
-
- ed = evas_object_smart_data_get(obj);
- if (!ed) return;
- for (l = ed->parts; l; l = l->next)
- {
- Edje_Real_Part *ep;
-
- ep = l->data;
- if (ep->extra_objects)
- {
- Evas_List *el;
-
- for (el = ep->extra_objects; el; el = el->next)
- {
- Evas_Object *o;
-
- o = el->data;
- evas_object_stack_below(o, below);
- }
- }
- evas_object_stack_below(ep->object, below);
- if (ep->swallowed_object)
- evas_object_stack_below(ep->swallowed_object, below);
- }
- _edje_emit(ed, "stack_below", "");
-}
-
-static Evas_Object *
-_edje_smart_above_get(Evas_Object * obj)
-{
- Edje *ed;
-
- ed = evas_object_smart_data_get(obj);
- if (!ed) return obj;
- if (ed->parts)
- {
- Edje_Real_Part *ep;
-
- ep = evas_list_last(ed->parts)->data;
- if (ep->swallowed_object)
- return ep->swallowed_object;
- return ep->object;
- }
- return obj;
-}
-
-static Evas_Object *
-_edje_smart_below_get(Evas_Object * obj)
-{
- Edje *ed;
-
- ed = evas_object_smart_data_get(obj);
- if (!ed) return obj;
- if (ed->parts)
- {
- Edje_Real_Part *ep;
-
- ep = ed->parts->data;
- return ep->object;
- }
- return obj;
-}
-
static void
_edje_smart_move(Evas_Object * obj, Evas_Coord x, Evas_Coord y)
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_text.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- edje_text.c 27 Apr 2005 08:11:58 -0000 1.38
+++ edje_text.c 27 Oct 2005 02:44:36 -0000 1.39
@@ -198,7 +198,6 @@
evas_object_smart_member_add(o, ed->obj);
evas_object_pass_events_set(o, 1);
evas_object_clip_set(o, ed->clipper);
- evas_object_layer_set(o, evas_object_layer_get(ed->obj));
evas_object_show(o);
ep->extra_objects = evas_list_append(ep->extra_objects, o);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_util.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -3 -r1.63 -r1.64
--- edje_util.c 28 Sep 2005 07:13:16 -0000 1.63
+++ edje_util.c 27 Oct 2005 02:44:36 -0000 1.64
@@ -573,8 +573,6 @@
if (rp->clip_to)
evas_object_clip_set(rp->swallowed_object, rp->clip_to->object);
else evas_object_clip_set(rp->swallowed_object, ed->clipper);
- if (evas_object_layer_get(rp->swallowed_object) != ed->layer)
- evas_object_layer_set(rp->swallowed_object, ed->layer);
evas_object_stack_above(rp->swallowed_object, rp->object);
evas_object_event_callback_add(rp->swallowed_object,
EVAS_CALLBACK_FREE,
-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
