toolbar - dont create icon objects then del if icon is null

if icon is null just never create an icon obj.. but if it's not null
it's intended so even if blank, don't delete it - so things line up.

diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c
index d79d9ae..8d8e316 100644 (file)
--- a/src/lib/elementary/elm_toolbar.c
+++ b/src/lib/elementary/elm_toolbar.c
@@ -2661,29 +2661,25 @@ _item_new(Evas_Object *obj,
    elm_widget_tree_unfocusable_set(VIEW(it), EINA_TRUE);
    evas_object_data_set(VIEW(it), "item", it);
 
-   icon_obj = elm_icon_add(VIEW(it));
-   /* TIZEN_ONLY(20180412): lookup_order implements */
-   if (sd->has_lookup_order)
-     elm_icon_order_lookup_set(icon_obj, sd->lookup_order);
-   /* END */
-
-   if (_elm_atspi_enabled())
-       if (icon_obj) efl_parent_set(icon_obj, eo_it);
-
    if (_elm_config->access_mode == ELM_ACCESS_MODE_ON)
      _access_widget_item_register(it);
 
-   if (_item_icon_set(icon_obj, "toolbar/", icon))
+   if (icon)
      {
+        icon_obj = elm_icon_add(VIEW(it));
+        efl_parent_set(icon_obj, eo_it);
+
+        /* TIZEN_ONLY(20180412): lookup_order implements */
+        if (sd->has_lookup_order)
+          elm_icon_order_lookup_set(icon_obj, sd->lookup_order);
+        /* END */
+
+        evas_object_size_hint_min_set(icon_obj, sd->icon_size, sd->icon_size);
+        evas_object_size_hint_max_set(icon_obj, sd->icon_size, sd->icon_size);
+        _item_icon_set(icon_obj, "toolbar/", icon);
         it->icon = icon_obj;
         it->icon_str = eina_stringshare_add(icon);
      }
-   else
-     {
-        it->icon = NULL;
-        it->icon_str = NULL;
-        evas_object_del(icon_obj);
-     }
 
    if (!elm_layout_theme_set
        (VIEW(it), "toolbar", "item", elm_widget_style_get(obj)))
@@ -2704,8 +2700,6 @@ _item_new(Evas_Object *obj,
 
    if (it->icon)
      {
-        evas_object_size_hint_min_set(it->icon, sd->icon_size, sd->icon_size);
-        evas_object_size_hint_max_set(it->icon, sd->icon_size, sd->icon_size);
         elm_layout_content_set(VIEW(it), "elm.swallow.icon", it->icon);
         elm_layout_signal_emit(VIEW(it), "elm,state,icon,visible", "elm");
         elm_layout_signal_emit(VIEW(it), "elm,icon,visible", "elm");