Enlightenment CVS committal Author : urandom Project : e17 Module : apps/e
Dir : e17/apps/e/src/bin Modified Files: e_widget_framelist.c e_widget_framelist.h e_widget_frametable.c e_widget_frametable.h e_widget_image.c Log Message: e_widget_image will use the min group size of the edje being added, if no min width or height are given. a few helpful functions for e_widget_frame* =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_framelist.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- e_widget_framelist.c 23 Aug 2006 03:39:02 -0000 1.11 +++ e_widget_framelist.c 21 Feb 2007 03:55:18 -0000 1.12 @@ -87,6 +87,15 @@ e_box_align_set(wd->o_box, halign, valign); } +EAPI void +e_widget_framelist_label_set(Evas_Object *obj, char *label) +{ + E_Widget_Data *wd; + + wd = e_widget_data_get(obj); + edje_object_part_text_set(wd->o_frame, "e.text.label", label); +} + static void _e_wid_del_hook(Evas_Object *obj) =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_framelist.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_widget_framelist.h 23 Jul 2006 11:22:13 -0000 1.4 +++ e_widget_framelist.h 21 Feb 2007 03:55:18 -0000 1.5 @@ -9,6 +9,7 @@ EAPI Evas_Object *e_widget_framelist_add(Evas *evas, char *label, int horiz); EAPI void e_widget_framelist_object_append(Evas_Object *obj, Evas_Object *sobj); EAPI void e_widget_framelist_content_align_set(Evas_Object *obj, double halign, double valign); +EAPI void e_widget_framelist_label_set(Evas_Object *obj, char *label); #endif #endif =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_frametable.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_widget_frametable.c 23 Aug 2006 03:39:02 -0000 1.6 +++ e_widget_frametable.c 21 Feb 2007 03:55:18 -0000 1.7 @@ -77,6 +77,24 @@ evas_object_show(sobj); } +EAPI void +e_widget_frametable_content_align_set(Evas_Object *obj, double halign, double valign) +{ + E_Widget_Data *wd; + + wd = e_widget_data_get(obj); + e_table_align_set(wd->o_table, halign, valign); +} + +EAPI void +e_widget_frametable_label_set(Evas_Object *obj, char *label) +{ + E_Widget_Data *wd; + + wd = e_widget_data_get(obj); + edje_object_part_text_set(wd->o_frame, "e.text.label", label); +} + static void _e_wid_del_hook(Evas_Object *obj) { =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_frametable.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_widget_frametable.h 13 Oct 2005 09:06:15 -0000 1.2 +++ e_widget_frametable.h 21 Feb 2007 03:55:18 -0000 1.3 @@ -8,6 +8,8 @@ EAPI Evas_Object *e_widget_frametable_add(Evas *evas, char *label, int homogenous); EAPI void e_widget_frametable_object_append(Evas_Object *obj, Evas_Object *sobj, int col, int row, int colspan, int rowspan, int fill_w, int fill_h, int expand_w, int expand_h); +EAPI void e_widget_frametable_content_align_set(Evas_Object *obj, double halign, double valign); +EAPI void e_widget_frametable_label_set(Evas_Object *obj, char *label); #endif #endif =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_image.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- e_widget_image.c 12 Jan 2007 13:22:34 -0000 1.9 +++ e_widget_image.c 21 Feb 2007 03:55:18 -0000 1.10 @@ -7,6 +7,7 @@ struct _E_Widget_Data { Evas_Object *img; + int minw, minh; }; static void _e_wid_del_hook(Evas_Object *obj); @@ -19,6 +20,7 @@ { Evas_Object *obj, *o; E_Widget_Data *wd; + int mw = 0, mh = 0; obj = e_widget_add(evas); e_widget_del_hook_set(obj, _e_wid_del_hook); @@ -29,9 +31,15 @@ e_icon_fill_inside_set(o, 1); e_icon_object_set(o, object); wd->img = o; - e_widget_data_set(obj, wd); + e_widget_data_set(obj, wd); e_widget_can_focus_set(obj, 0); - e_widget_min_size_set(obj, minw, minh); + wd->minw = minw <= 0 ? minw : 0; + wd->minh = minh <= 0 ? minh : 0; + edje_object_size_min_get(object, &mw, &mh); + if (minw || minh) + e_widget_min_size_set(obj, minw, minh); + else + e_widget_min_size_set(obj, mw, mh); e_widget_sub_object_add(obj, o); e_widget_resize_object_set(obj, o); @@ -98,9 +106,15 @@ e_widget_image_object_set(Evas_Object *obj, Evas_Object *o) { E_Widget_Data *wd; + int mw, mh; wd = e_widget_data_get(obj); e_icon_object_set(wd->img, o); + edje_object_size_min_get(o, &mw, &mh); + if (wd->minw || wd->minh) + e_widget_min_size_set(obj, wd->minw, wd->minh); + else + e_widget_min_size_set(obj, mw, mh); evas_object_show(wd->img); } ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs