Enlightenment CVS committal Author : raster Project : e17 Module : libs/edje
Dir : e17/libs/edje/src/bin Modified Files: edje_cc_handlers.c edje_test_main.c Log Message: hmm - make min size calculation mroe accurate and handle corner cases... =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/edje/src/bin/edje_cc_handlers.c,v retrieving revision 1.60 retrieving revision 1.61 diff -u -3 -r1.60 -r1.61 --- edje_cc_handlers.c 18 Sep 2005 05:37:06 -0000 1.60 +++ edje_cc_handlers.c 19 Sep 2005 06:51:48 -0000 1.61 @@ -42,6 +42,7 @@ static void st_collections_group_parts_part_description_state(void); static void st_collections_group_parts_part_description_visible(void); static void st_collections_group_parts_part_description_align(void); +static void st_collections_group_parts_part_description_fixed(void); static void st_collections_group_parts_part_description_min(void); static void st_collections_group_parts_part_description_max(void); static void st_collections_group_parts_part_description_step(void); @@ -149,6 +150,7 @@ {"collections.group.parts.part.description.state", st_collections_group_parts_part_description_state}, {"collections.group.parts.part.description.visible", st_collections_group_parts_part_description_visible}, {"collections.group.parts.part.description.align", st_collections_group_parts_part_description_align}, + {"collections.group.parts.part.description.fixed", st_collections_group_parts_part_description_fixed}, {"collections.group.parts.part.description.min", st_collections_group_parts_part_description_min}, {"collections.group.parts.part.description.max", st_collections_group_parts_part_description_max}, {"collections.group.parts.part.description.step", st_collections_group_parts_part_description_step}, @@ -858,6 +860,8 @@ ed->align.y = 0.5; ed->min.w = 0; ed->min.h = 0; + ed->fixed.w = 0; + ed->fixed.h = 0; ed->max.w = -1; ed->max.h = -1; ed->rel1.relative_x = 0.0; @@ -1083,6 +1087,23 @@ } static void +st_collections_group_parts_part_description_fixed(void) +{ + Edje_Part_Collection *pc; + Edje_Part *ep; + Edje_Part_Description *ed; + + check_arg_count(2); + + pc = evas_list_data(evas_list_last(edje_collections)); + ep = evas_list_data(evas_list_last(pc->parts)); + ed = ep->default_desc; + if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + ed->fixed.w = parse_float_range(0, 0, 1); + ed->fixed.h = parse_float_range(1, 0, 1); +} + +static void st_collections_group_parts_part_description_min(void) { Edje_Part_Collection *pc; =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/edje/src/bin/edje_test_main.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- edje_test_main.c 22 Mar 2005 19:29:06 -0000 1.2 +++ edje_test_main.c 19 Sep 2005 06:51:48 -0000 1.3 @@ -344,6 +344,21 @@ evas_object_show(o); o_edje = o; +/* + { + Evas_Coord mw, mh; + + printf("---EMIT SIGNALS\n"); + edje_object_signal_emit(o_edje, "icon_visible", ""); + printf("---PROCESS SIGNALS\n"); + edje_object_message_signal_process(o_edje); + printf("---MIN CALC\n"); + edje_object_size_min_calc(o_edje, &mw, &mh); + printf("---MIN %ix%i\n", mw, mh); + evas_object_resize(o_edje, mw, mh); + } + */ + ecore_evas_callback_resize_set(ee, resize_cb); ecore_evas_show(ee); ------------------------------------------------------- SF.Net email is sponsored by: Tame your development challenges with Apache's Geronimo App Server. Download it for free - -and be entered to win a 42" plasma tv or your very own Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs