Enlightenment CVS committal Author : raster Project : e17 Module : apps/e
Dir : e17/apps/e/src/bin Modified Files: e_gadcon.c e_gadcon.h Log Message: a bit more gadcon work =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_gadcon.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_gadcon.c 5 Feb 2006 09:29:47 -0000 1.3 +++ e_gadcon.c 6 Feb 2006 10:44:54 -0000 1.4 @@ -121,6 +121,8 @@ gc->name = evas_stringshare_add(name); gc->id = evas_stringshare_add(id); + gc->layout_policy = E_GADCON_LAYOUT_POLICY_PANEL; + gc->edje.o_parent = obj; gc->edje.swallow_name = evas_stringshare_add(swallow_name); @@ -133,6 +135,16 @@ } EAPI void +e_gadcon_layout_policy_set(E_Gadcon *gc, E_Gadcon_Layout_Policy layout_policy) +{ + E_OBJECT_CHECK(gc); + E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE); + if (gc->layout_policy == layout_policy) return; + gc->layout_policy = layout_policy; + /* FIXME: delete container obj, re-pack all clients */ +} + +EAPI void e_gadcon_populate(E_Gadcon *gc) { Evas_List *l; @@ -140,7 +152,6 @@ E_OBJECT_CHECK_RETURN(gc, NULL); E_OBJECT_TYPE_CHECK_RETURN(gc, E_GADCON_TYPE, NULL); - for (i = 0; i < 6; i++) { E_Gadcon_Client_Class *cc; @@ -190,6 +201,8 @@ { Evas_List *l; + E_OBJECT_CHECK(gc); + E_OBJECT_TYPE_CHECK(gc, E_GADCON_TYPE); if (gc->orient == orient) return; gc->orient = orient; for (l = gc->clients; l; l = l->next) @@ -209,7 +222,6 @@ E_OBJECT_CHECK_RETURN(gc, NULL); E_OBJECT_TYPE_CHECK_RETURN(gc, E_GADCON_TYPE, NULL); - gcc = E_OBJECT_ALLOC(E_Gadcon_Client, E_GADCON_CLIENT_TYPE, _e_gadcon_client_free); if (!gcc) return NULL; gcc->gadcon = gc; @@ -227,7 +239,6 @@ { E_OBJECT_CHECK(gcc); E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE); - switch (gcc->gadcon->orient) { case E_GADCON_ORIENT_HORIZ: =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_gadcon.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_gadcon.h 5 Feb 2006 09:29:47 -0000 1.3 +++ e_gadcon.h 6 Feb 2006 10:44:54 -0000 1.4 @@ -3,6 +3,12 @@ */ #ifdef E_TYPEDEFS +/* different layout policies - only 1 supported for now */ +typedef enum _E_Gadcon_Layout_Policy +{ + E_GADCON_LAYOUT_POLICY_PANEL +} E_Gadcon_Layout_Policy; + typedef enum _E_Gadcon_Orient { /* generic orientations */ @@ -33,6 +39,8 @@ char *name; char *id; + E_Gadcon_Layout_Policy layout_policy; + struct { Evas_Object *o_parent; char *swallow_name; @@ -73,6 +81,7 @@ EAPI void e_gadcon_provider_register(E_Gadcon_Client_Class *cc); EAPI void e_gadcon_provider_unregister(E_Gadcon_Client_Class *cc); EAPI E_Gadcon *e_gadcon_swallowed_new(char *name, char *id, Evas_Object *obj, char *swallow_name); +EAPI void e_gadcon_layout_policy_set(E_Gadcon *gc, E_Gadcon_Layout_Policy layout_policy); EAPI void e_gadcon_populate(E_Gadcon *gc); EAPI void e_gadcon_orient(E_Gadcon *gc, E_Gadcon_Orient orient); ------------------------------------------------------- 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://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs