diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index f2dfdab8e..c1c317d36 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -90,7 +90,8 @@ e_widget_framelist.h \ e_widget_list.h \ e_widget_button.h \ e_widget_label.h \ -e_widget_frametable.h +e_widget_frametable.h \ +e_widget_table.h enlightenment_src = \ e_user.c \ @@ -163,6 +164,7 @@ e_widget_list.c \ e_widget_button.c \ e_widget_label.c \ e_widget_frametable.c \ +e_widget_table.c \ $(ENLIGHTENMENTHEADERS) enlightenment_SOURCES = \ diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h index bd8e0e0b4..b641321de 100644 --- a/src/bin/e_includes.h +++ b/src/bin/e_includes.h @@ -72,3 +72,4 @@ #include "e_widget_button.h" #include "e_widget_label.h" #include "e_widget_frametable.h" +#include "e_widget_table.h" diff --git a/src/bin/e_widget_frametable.h b/src/bin/e_widget_frametable.h index 271f45cf5..f85fc035a 100644 --- a/src/bin/e_widget_frametable.h +++ b/src/bin/e_widget_frametable.h @@ -8,7 +8,6 @@ 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); - #endif #endif diff --git a/src/bin/e_widget_table.c b/src/bin/e_widget_table.c new file mode 100644 index 000000000..f327a7a52 --- /dev/null +++ b/src/bin/e_widget_table.c @@ -0,0 +1,70 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ +#include "e.h" + +typedef struct _E_Widget_Data E_Widget_Data; +struct _E_Widget_Data +{ + Evas_Object *o_table; +}; + +static void _e_wid_del_hook(Evas_Object *obj); + +/* local subsystem functions */ + +/* externally accessible functions */ +Evas_Object * +e_widget_table_add(Evas *evas, char *label, int homogenous) +{ + Evas_Object *obj, *o; + E_Widget_Data *wd; + Evas_Coord mw, mh; + + obj = e_widget_add(evas); + + e_widget_del_hook_set(obj, _e_wid_del_hook); + wd = calloc(1, sizeof(E_Widget_Data)); + e_widget_data_set(obj, wd); + + o = e_table_add(evas); + wd->o_table = o; + e_table_homogenous_set(o, homogenous); + evas_object_show(o); + e_widget_sub_object_add(obj, o); + e_widget_resize_object_set(obj, o); + + return obj; +} + +void +e_widget_table_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) +{ + E_Widget_Data *wd; + Evas_Coord mw, mh; + + wd = e_widget_data_get(obj); + + e_table_pack(wd->o_table, sobj, col, row, colspan, rowspan); + e_widget_min_size_get(sobj, &mw, &mh); + e_table_pack_options_set(sobj, + fill_w, fill_h, /* fill */ + expand_w, expand_h, /* expand */ + 0.5, 0.5, /* align */ + mw, mh, /* min */ + 99999, 99999 /* max */ + ); + e_table_min_size_get(wd->o_table, &mw, &mh); + e_widget_min_size_set(obj, mw, mh); + e_widget_sub_object_add(obj, sobj); + evas_object_show(sobj); +} + +static void +_e_wid_del_hook(Evas_Object *obj) +{ + E_Widget_Data *wd; + + wd = e_widget_data_get(obj); + free(wd); +} diff --git a/src/bin/e_widget_table.h b/src/bin/e_widget_table.h new file mode 100644 index 000000000..c871f96e7 --- /dev/null +++ b/src/bin/e_widget_table.h @@ -0,0 +1,13 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ +#ifdef E_TYPEDEFS +#else +#ifndef E_WIDGET_TABLE_H +#define E_WIDGET_TABLE_H + +EAPI Evas_Object *e_widget_table_add(Evas *evas, char *label, int homogenous); +EAPI void e_widget_table_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); + +#endif +#endif