[Genlist] Fixed garbage item issue in decorate all mode.

[framework/uifw/elementary.git] / src / lib / elm_toolbar.c

diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index af07b51..6bbebb6 100644 (file)
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -378,8 +378,11 @@ _theme_hook_item(Evas_Object *obj, Elm_Toolbar_Item *it, double scale, int icon_
              edje_object_part_swallow(view, "elm.swallow.icon", it->icon);
              edje_object_signal_emit(VIEW(it), "elm,state,icon,visible", "elm");
           }
-        edje_object_part_text_escaped_set(view, "elm.text", it->label);
-        edje_object_signal_emit(VIEW(it), "elm,state,text,visible", "elm");
+        if (it->label)
+          {
+             edje_object_part_text_escaped_set(view, "elm.text", it->label);
+             edje_object_signal_emit(VIEW(it), "elm,state,text,visible", "elm");
+          }
      }
    else
      {
@@ -441,6 +444,7 @@ _theme_hook(Evas_Object *obj)
    if (!wd) return;
    _elm_widget_mirrored_reload(obj);
    elm_smart_scroller_object_theme_set(obj, wd->scr, "toolbar", "base", elm_widget_style_get(obj));
+   elm_layout_theme_set(wd->more, "toolbar", "more", elm_widget_style_get(obj));
    _mirrored_set(obj, elm_widget_mirrored_get(obj));
    scale = (elm_widget_scale_get(obj) * _elm_config->scale);
    edje_object_scale_set(wd->scr, scale);
@@ -1082,8 +1086,11 @@ _item_reorder_start(Elm_Toolbar_Item *item)
         evas_object_show(it->icon);
         elm_widget_sub_object_add(obj, it->icon);
      }
-   edje_object_part_text_escaped_set(VIEW(it), "elm.text", it->label);
-   edje_object_signal_emit(VIEW(it), "elm,state,text,visible", "elm");
+   if (it->label)
+     {
+        edje_object_part_text_escaped_set(VIEW(it), "elm.text", it->label);
+        edje_object_signal_emit(VIEW(it), "elm,state,text,visible", "elm");
+     }
 
    edje_object_signal_emit(VIEW(it), "elm,state,moving", "elm");