From ead3676196a48aea3df01c7b2d8b64fd904025c1 Mon Sep 17 00:00:00 2001 From: Mike McCormack Date: Fri, 25 Nov 2011 17:34:59 +0900 Subject: [PATCH] [icon] Reduce diff with upstream --- src/lib/els_icon.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/src/lib/els_icon.c b/src/lib/els_icon.c index d049622..e4893ab 100755 --- a/src/lib/els_icon.c +++ b/src/lib/els_icon.c @@ -82,23 +82,21 @@ _els_smart_icon_file_helper(Evas_Object *obj) /* smart code here */ /* NOTE: Do not merge upstream for the if (sd->edje) { } statements But wonder whether the edje resource icons have no problem. */ - if (sd->edje) - { - if (sd->prev) evas_object_del(sd->prev); - pclip = evas_object_clip_get(sd->obj); - if (sd->obj) sd->prev = sd->obj; - sd->obj = evas_object_image_add(evas_object_evas_get(obj)); - evas_object_event_callback_add(sd->obj, - EVAS_CALLBACK_IMAGE_PRELOADED, - _preloaded, sd); - evas_object_smart_member_add(sd->obj, obj); - if (sd->prev) evas_object_smart_member_add(sd->prev, obj); - evas_object_image_scale_hint_set(sd->obj, - EVAS_IMAGE_SCALE_HINT_STATIC); - evas_object_clip_set(sd->obj, pclip); + if (!sd->edje) goto out; - sd->edje = EINA_FALSE; - } + if (sd->prev) evas_object_del(sd->prev); + pclip = evas_object_clip_get(sd->obj); + if (sd->obj) sd->prev = sd->obj; + sd->obj = evas_object_image_add(evas_object_evas_get(obj)); + evas_object_event_callback_add(sd->obj, EVAS_CALLBACK_IMAGE_PRELOADED, + _preloaded, sd); + evas_object_smart_member_add(sd->obj, obj); + if (sd->prev) evas_object_smart_member_add(sd->prev, obj); + evas_object_image_scale_hint_set(sd->obj, EVAS_IMAGE_SCALE_HINT_STATIC); + evas_object_clip_set(sd->obj, pclip); + + sd->edje = EINA_FALSE; +out: if (!sd->size) evas_object_image_load_size_set(sd->obj, sd->size, sd->size); -- 2.7.4