Merge "[datetime_input_ctxpopup.c] Default AM/PM strings are added to display, incase...

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

diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 5fbbe3f..6bbebb6 100644 (file)
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -376,8 +376,13 @@ _theme_hook_item(Evas_Object *obj, Elm_Toolbar_Item *it, double scale, int icon_
              evas_object_size_hint_min_set(it->icon, ms, ms);
              evas_object_size_hint_max_set(it->icon, ms, ms);
              edje_object_part_swallow(view, "elm.swallow.icon", it->icon);
+             edje_object_signal_emit(VIEW(it), "elm,state,icon,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");
           }
-        edje_object_part_text_escaped_set(view, "elm.text", it->label);
      }
    else
      {
@@ -439,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);
@@ -1076,11 +1082,15 @@ _item_reorder_start(Elm_Toolbar_Item *item)
         evas_object_size_hint_min_set(it->icon, ms, ms);
         evas_object_size_hint_max_set(it->icon, ms, ms);
         edje_object_part_swallow(VIEW(it), "elm.swallow.icon", it->icon);
-        edje_object_signal_emit(VIEW(it), "elm,state,icon,visible", "elm"); //!!
+        edje_object_signal_emit(VIEW(it), "elm,state,icon,visible", "elm");
         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);
+   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");
 
@@ -1441,9 +1451,10 @@ _elm_toolbar_item_icon_update(Elm_Toolbar_Item *item)
    Evas_Object *old_icon = edje_object_part_swallow_get(VIEW(item),
                                                         "elm.swallow.icon");
    elm_widget_sub_object_del(VIEW(item), old_icon);
-   evas_object_hide(old_icon);
+   /* edje_object_part_unswallow(VIEW(item), old_icon); */
    edje_object_part_swallow(VIEW(item), "elm.swallow.icon", item->icon);
    edje_object_signal_emit(VIEW(item), "elm,state,icon,visible", "elm");
+   evas_object_hide(old_icon);
    elm_coords_finger_size_adjust(1, &mw, 1, &mh);
    edje_object_size_min_restricted_calc(VIEW(item), &mw, &mh, mw, mh);
    elm_coords_finger_size_adjust(1, &mw, 1, &mh);