From: Gustavo Sverzut Barbieri Date: Wed, 14 Jul 2010 21:14:52 +0000 (+0000) Subject: fix widgets that were forcing style to be "default". X-Git-Tag: v1.0.0~4471 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=35952e45578a4318475bf53f538f26ae84e46af0;p=platform%2Fupstream%2Felementary.git fix widgets that were forcing style to be "default". SVN revision: 50257 --- diff --git a/src/lib/elm_icon.c b/src/lib/elm_icon.c index a34a872f7..ebcfda90b 100644 --- a/src/lib/elm_icon.c +++ b/src/lib/elm_icon.c @@ -49,7 +49,7 @@ _theme_hook(Evas_Object *obj) Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; if (wd->stdicon) - _elm_theme_object_icon_set(obj, wd->img, wd->stdicon, "default"); + _elm_theme_object_icon_set(obj, wd->img, wd->stdicon, elm_widget_style_get(obj)); _sizing_eval(obj); } diff --git a/src/lib/elm_panes.c b/src/lib/elm_panes.c index 83494682e..a1d81a34a 100644 --- a/src/lib/elm_panes.c +++ b/src/lib/elm_panes.c @@ -50,17 +50,18 @@ static void _theme_hook(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); + const char *style = elm_widget_style_get(obj); if (!wd) return; - if(wd->horizontal) - _elm_theme_object_set(obj, wd->panes, "panes", "horizontal", "default"); + if (wd->horizontal) + _elm_theme_object_set(obj, wd->panes, "panes", "horizontal", style); else - _elm_theme_object_set(obj, wd->panes, "panes", "vertical", "default"); + _elm_theme_object_set(obj, wd->panes, "panes", "vertical", style); - if(wd->contents.left) - edje_object_part_swallow(wd->panes, "elm.swallow.left", wd->contents.right); - if(wd->contents.right) - edje_object_part_swallow(wd->panes, "elm.swallow.right", wd->contents.right); + if (wd->contents.left) + edje_object_part_swallow(wd->panes, "elm.swallow.left", wd->contents.right); + if (wd->contents.right) + edje_object_part_swallow(wd->panes, "elm.swallow.right", wd->contents.right); edje_object_scale_set(wd->panes, elm_widget_scale_get(obj) * _elm_config->scale); diff --git a/src/lib/elm_slideshow.c b/src/lib/elm_slideshow.c index 7ccaa6440..7f9d9e5f9 100644 --- a/src/lib/elm_slideshow.c +++ b/src/lib/elm_slideshow.c @@ -92,7 +92,7 @@ _theme_hook(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; - _elm_theme_object_set(obj, wd->slideshow, "slideshow", "base", "default"); + _elm_theme_object_set(obj, wd->slideshow, "slideshow", "base", elm_widget_style_get(obj)); edje_object_scale_set(wd->slideshow, elm_widget_scale_get(obj) * _elm_config->scale); _sizing_eval(obj);