From: raster Date: Fri, 29 Jun 2012 12:28:08 +0000 (+0000) Subject: oops forgot part of previous toolbar style patch. in! X-Git-Tag: 1.0.0+svn.70492slp2+build19~25 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d0f88a676fc6d9b21a8e263963325fae2a4b3aac;p=framework%2Fuifw%2Felementary.git oops forgot part of previous toolbar style patch. in! git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@73035 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 Conflicts: src/lib/elm_toolbar.c --- diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c index 5fbbe3f..dd6c0bf 100644 --- a/src/lib/elm_toolbar.c +++ b/src/lib/elm_toolbar.c @@ -1441,9 +1441,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);