From 316ba4938b6bf4757646b0dabe56f9cbc006015e Mon Sep 17 00:00:00 2001 From: Gustavo Lima Chaves Date: Thu, 3 May 2012 22:43:16 +0000 Subject: [PATCH] [Elm] Elm grid now ported to new class hierarchy. SVN revision: 70728 --- src/lib/elm_grid.c | 262 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 173 insertions(+), 89 deletions(-) diff --git a/src/lib/elm_grid.c b/src/lib/elm_grid.c index 22f1b23..f166e95 100644 --- a/src/lib/elm_grid.c +++ b/src/lib/elm_grid.c @@ -1,35 +1,50 @@ #include #include "elm_priv.h" -typedef struct _Widget_Data Widget_Data; +static const char GRID_SMART_NAME[] = "elm_grid"; -struct _Widget_Data -{ - Evas_Object *obj, *grd; -}; +typedef struct _Elm_Grid_Smart_Data Elm_Grid_Smart_Data; -static const char *widtype = NULL; -static void _del_hook(Evas_Object *obj); -static void _theme_hook(Evas_Object *obj); +#define ELM_GRID_DATA_GET(o, sd) \ + Elm_Widget_Smart_Data * sd = evas_object_smart_data_get(o) -static void -_del_hook(Evas_Object *obj) -{ - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - free(wd); -} +#define ELM_GRID_DATA_GET_OR_RETURN(o, ptr) \ + ELM_GRID_DATA_GET(o, ptr); \ + if (!ptr) \ + { \ + CRITICAL("No widget data for object %p (%s)", \ + o, evas_object_type_get(o)); \ + return; \ + } + +#define ELM_GRID_DATA_GET_OR_RETURN_VAL(o, ptr, val) \ + ELM_GRID_DATA_GET(o, ptr); \ + if (!ptr) \ + { \ + CRITICAL("No widget data for object %p (%s)", \ + o, evas_object_type_get(o)); \ + return val; \ + } + +#define ELM_GRID_CHECK(obj) \ + if (!obj || !elm_widget_type_check((obj), GRID_SMART_NAME, __func__)) \ + return + +EVAS_SMART_SUBCLASS_NEW + (GRID_SMART_NAME, _elm_grid, Elm_Widget_Smart_Class, + Elm_Widget_Smart_Class, elm_widget_smart_class_get, NULL); static Eina_Bool -_elm_grid_focus_next_hook(const Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next) +_elm_grid_smart_focus_next(const Evas_Object *obj, + Elm_Focus_Direction dir, + Evas_Object **next) { - Widget_Data *wd = elm_widget_data_get(obj); + Eina_Bool ret; const Eina_List *items; - void *(*list_data_get) (const Eina_List *list); - Eina_List *(*list_free) (Eina_List *list); + Eina_List *(*list_free)(Eina_List *list); + void *(*list_data_get)(const Eina_List *list); - if ((!wd) || (!wd->grd)) - return EINA_FALSE; + ELM_GRID_DATA_GET(obj, sd); /* Focus chain */ /* TODO: Change this to use other chain */ @@ -40,18 +55,16 @@ _elm_grid_focus_next_hook(const Evas_Object *obj, Elm_Focus_Direction dir, Evas_ } else { - items = evas_object_grid_children_get(wd->grd); + items = evas_object_grid_children_get(sd->resize_obj); list_data_get = eina_list_data_get; list_free = eina_list_free; if (!items) return EINA_FALSE; } - Eina_Bool ret = elm_widget_focus_list_next_get(obj, items, list_data_get, - dir, next); + ret = elm_widget_focus_list_next_get(obj, items, list_data_get, dir, next); - if (list_free) - list_free((Eina_List *)items); + if (list_free) list_free((Eina_List *)items); return ret; } @@ -59,119 +72,190 @@ _elm_grid_focus_next_hook(const Evas_Object *obj, Elm_Focus_Direction dir, Evas_ static void _mirrored_set(Evas_Object *obj, Eina_Bool rtl) { - Widget_Data *wd = elm_widget_data_get(obj); - if ((!wd) || (!wd->grd)) return; - evas_object_grid_mirrored_set(wd->grd, rtl); + ELM_GRID_DATA_GET(obj, sd); + + evas_object_grid_mirrored_set(sd->resize_obj, rtl); } -static void -_theme_hook(Evas_Object *obj) +static Eina_Bool +_elm_grid_smart_theme(Evas_Object *obj) { - _elm_widget_mirrored_reload(obj); + if (!_elm_grid_parent_sc->theme(obj)) return EINA_FALSE; + _mirrored_set(obj, elm_widget_mirrored_get(obj)); + + return EINA_TRUE; +} + +static void +_elm_grid_smart_add(Evas_Object *obj) +{ + EVAS_SMART_DATA_ALLOC(obj, Elm_Widget_Smart_Data); + + priv->resize_obj = evas_object_grid_add(evas_object_evas_get(obj)); + evas_object_grid_size_set(priv->resize_obj, 100, 100); + + _elm_grid_parent_sc->base.add(obj); + + elm_widget_can_focus_set(obj, EINA_FALSE); + + _elm_grid_smart_theme(obj); +} + +static void +_elm_grid_smart_del(Evas_Object *obj) +{ + Eina_List *l; + Evas_Object *child; + + ELM_GRID_DATA_GET(obj, sd); + + /* let's make our grid object the *last* to be processed, since it + * may (smart) parent other sub objects here */ + EINA_LIST_FOREACH (sd->subobjs, l, child) + { + if (child == sd->resize_obj) + { + sd->subobjs = eina_list_demote_list(sd->subobjs, l); + break; + } + } + + _elm_grid_parent_sc->base.del(obj); +} + +static void +_elm_grid_smart_set_user(Elm_Widget_Smart_Class *sc) +{ + sc->base.add = _elm_grid_smart_add; + sc->base.del = _elm_grid_smart_del; + + sc->theme = _elm_grid_smart_theme; + sc->focus_next = _elm_grid_smart_focus_next; } EAPI Evas_Object * elm_grid_add(Evas_Object *parent) { - Evas_Object *obj; Evas *e; - Widget_Data *wd; - - ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); - ELM_SET_WIDTYPE(widtype, "grid"); - elm_widget_type_set(obj, "grid"); - elm_widget_sub_object_add(parent, obj); - elm_widget_data_set(obj, wd); - elm_widget_del_hook_set(obj, _del_hook); - elm_widget_focus_next_hook_set(obj, _elm_grid_focus_next_hook); - elm_widget_can_focus_set(obj, EINA_FALSE); - elm_widget_theme_hook_set(obj, _theme_hook); + Evas_Object *obj; - wd->grd = evas_object_grid_add(e); - evas_object_grid_size_set(wd->grd, 100, 100); - elm_widget_resize_object_set(obj, wd->grd); + EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); + + e = evas_object_evas_get(parent); + if (!e) return NULL; + + obj = evas_object_smart_add(e, _elm_grid_smart_class_new()); + + if (!elm_widget_sub_object_add(parent, obj)) + ERR("could not add %p as sub object of %p", obj, parent); - _mirrored_set(obj, elm_widget_mirrored_get(obj)); return obj; } EAPI void -elm_grid_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h) +elm_grid_size_set(Evas_Object *obj, + Evas_Coord w, + Evas_Coord h) { - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - evas_object_grid_size_set(wd->grd, w, h); + ELM_GRID_CHECK(obj); + ELM_GRID_DATA_GET(obj, sd); + + evas_object_grid_size_set(sd->resize_obj, w, h); } EAPI void -elm_grid_size_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) +elm_grid_size_get(const Evas_Object *obj, + Evas_Coord *w, + Evas_Coord *h) { - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - evas_object_grid_size_get(wd->grd, w, h); + ELM_GRID_CHECK(obj); + ELM_GRID_DATA_GET(obj, sd); + + evas_object_grid_size_get(sd->resize_obj, w, h); } EAPI void -elm_grid_pack(Evas_Object *obj, Evas_Object *subobj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h) +elm_grid_pack(Evas_Object *obj, + Evas_Object *subobj, + Evas_Coord x, + Evas_Coord y, + Evas_Coord w, + Evas_Coord h) { - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; + ELM_GRID_CHECK(obj); + ELM_GRID_DATA_GET(obj, sd); + elm_widget_sub_object_add(obj, subobj); - evas_object_grid_pack(wd->grd, subobj, x, y, w, h); + evas_object_grid_pack(sd->resize_obj, subobj, x, y, w, h); } EAPI void -elm_grid_unpack(Evas_Object *obj, Evas_Object *subobj) +elm_grid_unpack(Evas_Object *obj, + Evas_Object *subobj) { - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; + ELM_GRID_CHECK(obj); + ELM_GRID_DATA_GET(obj, sd); + elm_widget_sub_object_del(obj, subobj); - evas_object_grid_unpack(wd->grd, subobj); + evas_object_grid_unpack(sd->resize_obj, subobj); } EAPI void -elm_grid_clear(Evas_Object *obj, Eina_Bool clear) +elm_grid_clear(Evas_Object *obj, + Eina_Bool clear) { Eina_List *chld; Evas_Object *o; - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - chld = evas_object_grid_children_get(wd->grd); - EINA_LIST_FREE(chld, o) elm_widget_sub_object_del(obj, o); - evas_object_grid_clear(wd->grd, clear); + + ELM_GRID_CHECK(obj); + ELM_GRID_DATA_GET(obj, sd); + + if (!clear) + { + chld = evas_object_grid_children_get(sd->resize_obj); + EINA_LIST_FREE (chld, o) + elm_widget_sub_object_del(obj, o); + } + + evas_object_grid_clear(sd->resize_obj, clear); } EAPI void -elm_grid_pack_set(Evas_Object *subobj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h) +elm_grid_pack_set(Evas_Object *subobj, + Evas_Coord x, + Evas_Coord y, + Evas_Coord w, + Evas_Coord h) { Evas_Object *obj = elm_widget_parent_widget_get(subobj); - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - evas_object_grid_pack(wd->grd, subobj, x, y, w, h); + + ELM_GRID_CHECK(obj); + ELM_GRID_DATA_GET(obj, sd); + + evas_object_grid_pack(sd->resize_obj, subobj, x, y, w, h); } EAPI void -elm_grid_pack_get(Evas_Object *subobj, int *x, int *y, int *w, int *h) +elm_grid_pack_get(Evas_Object *subobj, + int *x, + int *y, + int *w, + int *h) { Evas_Object *obj = elm_widget_parent_widget_get(subobj); - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - evas_object_grid_pack_get(wd->grd, subobj, x, y, w, h); + + ELM_GRID_CHECK(obj); + ELM_GRID_DATA_GET(obj, sd); + + evas_object_grid_pack_get(sd->resize_obj, subobj, x, y, w, h); } EAPI Eina_List * elm_grid_children_get(const Evas_Object *obj) { - ELM_CHECK_WIDTYPE(obj, widtype) NULL; - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return NULL; - return evas_object_grid_children_get(wd->grd); + ELM_GRID_CHECK(obj) NULL; + ELM_GRID_DATA_GET(obj, sd); + + return evas_object_grid_children_get(sd->resize_obj); } -- 2.7.4