From 1801b7cafd1db66cea9e109fb6601a7906297283 Mon Sep 17 00:00:00 2001 From: discomfitor Date: Thu, 29 Sep 2011 05:07:50 +0000 Subject: [PATCH] should probably apply theme hook to toolbar items at some point I guess git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@63650 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/elm_toolbar.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c index bf2fa23..20f63c3 100644 --- a/src/lib/elm_toolbar.c +++ b/src/lib/elm_toolbar.c @@ -834,10 +834,13 @@ elm_toolbar_item_append(Evas_Object *obj, const char *icon, const char *label, E Elm_Toolbar_Item *it = _item_new(obj, icon, label, func, data); if (!it) return NULL; + double scale = (elm_widget_scale_get(obj) * _elm_config->scale); wd->items = eina_inlist_append(wd->items, EINA_INLIST_GET(it)); evas_object_box_append(wd->bx, it->base.view); evas_object_show(it->base.view); + + _theme_hook_item(obj, it, scale, wd->icon_size); _sizing_eval(obj); return it; @@ -1061,10 +1064,12 @@ elm_toolbar_item_prepend(Evas_Object *obj, const char *icon, const char *label, Elm_Toolbar_Item *it = _item_new(obj, icon, label, func, data); if (!it) return NULL; + double scale = (elm_widget_scale_get(obj) * _elm_config->scale); wd->items = eina_inlist_prepend(wd->items, EINA_INLIST_GET(it)); evas_object_box_prepend(wd->bx, it->base.view); evas_object_show(it->base.view); + _theme_hook_item(obj, it, scale, wd->icon_size); _sizing_eval(obj); return it; @@ -1080,11 +1085,13 @@ elm_toolbar_item_insert_before(Evas_Object *obj, Elm_Toolbar_Item *before, const Elm_Toolbar_Item *it = _item_new(obj, icon, label, func, data); if (!it) return NULL; + double scale = (elm_widget_scale_get(obj) * _elm_config->scale); wd->items = eina_inlist_prepend_relative(wd->items, EINA_INLIST_GET(it), EINA_INLIST_GET(before)); evas_object_box_insert_before(wd->bx, it->base.view, before->base.view); evas_object_show(it->base.view); + _theme_hook_item(obj, it, scale, wd->icon_size); _sizing_eval(obj); return it; @@ -1100,11 +1107,13 @@ elm_toolbar_item_insert_after(Evas_Object *obj, Elm_Toolbar_Item *after, const c Elm_Toolbar_Item *it = _item_new(obj, icon, label, func, data); if (!it) return NULL; + double scale = (elm_widget_scale_get(obj) * _elm_config->scale); wd->items = eina_inlist_append_relative(wd->items, EINA_INLIST_GET(it), EINA_INLIST_GET(after)); evas_object_box_insert_after(wd->bx, it->base.view, after->base.view); evas_object_show(it->base.view); + _theme_hook_item(obj, it, scale, wd->icon_size); _sizing_eval(obj); return it; -- 2.7.4