should probably apply theme hook to toolbar items at some point I guess

SVN revision: 63650

diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index bf2fa23..20f63c3 100644 (file)
--- 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;