From 564d70a96607b0b46870634c17b04de7fd2232ba Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Thu, 8 Jul 2010 23:17:12 +0000 Subject: [PATCH] Fix gengrid usage of item class style. By: Leandro "acidx" Pereira SVN revision: 50136 --- src/lib/elm_gengrid.c | 5 ++++- src/lib/elm_layout.c | 7 +++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c index 5a26bd5..af26d35 100644 --- a/src/lib/elm_gengrid.c +++ b/src/lib/elm_gengrid.c @@ -439,6 +439,7 @@ static void _item_realize(Elm_Gengrid_Item *item) { char buf[1024]; + char style[1024]; if ((item->realized) || (item->delete_me)) return; item->base = edje_object_add(evas_object_evas_get(item->wd->self)); @@ -446,7 +447,9 @@ _item_realize(Elm_Gengrid_Item *item) _elm_config->scale); evas_object_smart_member_add(item->base, item->wd->pan_smart); elm_widget_sub_object_add(item->wd->self, item->base); - _elm_theme_object_set(item->wd->self, item->base, "gengrid", "item/default", + snprintf(style, sizeof(style), "item/%s", + item->gic->item_style ? item->gic->item_style : "default"); + _elm_theme_object_set(item->wd->self, item->base, "gengrid", style, elm_widget_style_get(item->wd->self)); item->spacer = evas_object_rectangle_add(evas_object_evas_get(item->wd->self)); evas_object_color_set(item->spacer, 0, 0, 0, 0); diff --git a/src/lib/elm_layout.c b/src/lib/elm_layout.c index 5b8da4f..3533063 100644 --- a/src/lib/elm_layout.c +++ b/src/lib/elm_layout.c @@ -279,10 +279,9 @@ elm_layout_content_unset(Evas_Object *obj, const char *swallow) { Evas_Object *content; if (!si->obj) return NULL; - content = si->obj; - elm_widget_sub_object_del(obj, si->obj); - edje_object_part_unswallow(wd->lay, si->obj); - si->obj = NULL; + content = si->obj; /* si will die in _sub_del due elm_widget_sub_object_del() */ + elm_widget_sub_object_del(obj, content); + edje_object_part_unswallow(wd->lay, content); return content; } } -- 2.7.4