From: Noha Park Date: Wed, 19 May 2010 00:16:43 +0000 (+0900) Subject: modify _elm_theme_set X-Git-Tag: beat-winset-test_0.1.1-40~314 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c9f91889fb39753d13b3e8fe102a4d7a7673bd99;p=framework%2Fuifw%2Felementary.git modify _elm_theme_set --- diff --git a/src/lib/elm_searchbar.c b/src/lib/elm_searchbar.c index a365f8c..5acf5d5 100755 --- a/src/lib/elm_searchbar.c +++ b/src/lib/elm_searchbar.c @@ -38,7 +38,12 @@ static void _theme_hook(Evas_Object *obj) Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; - _elm_theme_set(wd->base, "searchbar", "base", elm_widget_style_get(obj)); + /* Temp */ + Elm_Theme *th = NULL; + th = elm_theme_new(); + + + _elm_theme_set(th, wd->base, "searchbar", "base", elm_widget_style_get(obj)); if (wd->eb) edje_object_part_swallow(wd->base, "btn_text", wd->eb); @@ -157,7 +162,12 @@ EAPI Evas_Object *elm_searchbar_add(Evas_Object *parent) wd->base = edje_object_add(e); if (wd->base == NULL) return NULL; - _elm_theme_set(wd->base, "searchbar", "base", "default"); + + /* Temp */ + Elm_Theme *th = NULL; + th = elm_theme_new(); + + _elm_theme_set(th, wd->base, "searchbar", "base", "default"); // evas_object_size_hint_weight_set(wd->base, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); // evas_object_size_hint_align_set(wd->base, EVAS_HINT_FILL, EVAS_HINT_FILL); diff --git a/src/lib/elm_toolbar2.c b/src/lib/elm_toolbar2.c index c870790..e69149e 100755 --- a/src/lib/elm_toolbar2.c +++ b/src/lib/elm_toolbar2.c @@ -91,6 +91,10 @@ static void _theme_hook(Evas_Object *obj) int ms = 0; int scale = 0; + /* Temp */ + Elm_Theme *th = NULL; + th = elm_theme_new(); + if (!wd) return; scale = (elm_widget_scale_get(obj) * _elm_config->scale); edje_object_scale_set(wd->scr, scale); @@ -101,7 +105,8 @@ static void _theme_hook(Evas_Object *obj) edje_object_scale_set(it->base, scale); - _elm_theme_set(it->base, "toolbar2", "item", style); + + _elm_theme_set(th, it->base, "toolbar2", "item", style); if (it->icon) { @@ -356,7 +361,11 @@ EAPI Elm_Toolbar2_Item *elm_toolbar2_item_add(Evas_Object *obj, Evas_Object *ico it->data = data; it->base = edje_object_add(evas_object_evas_get(obj)); - _elm_theme_set(it->base, "toolbar2", "item", elm_widget_style_get(obj)); + /* Temp */ + Elm_Theme *th = NULL; + th = elm_theme_new(); + + _elm_theme_set(th, it->base, "toolbar2", "item", elm_widget_style_get(obj)); evas_object_event_callback_add(it->icon, EVAS_CALLBACK_MOUSE_DOWN, press_down_cb, it); evas_object_event_callback_add(it->icon, EVAS_CALLBACK_MOUSE_UP, press_up_cb, it);