hermet pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=3b6961e17542d8940d6de9a08b9b820f1fe7a5f7

commit 3b6961e17542d8940d6de9a08b9b820f1fe7a5f7
Author: ChunEon Park <her...@hermet.pe.kr>
Date:   Sun Sep 29 17:30:55 2013 +0900

    evas/canvas - code refactoring. more clean code.
---
 src/lib/evas/canvas/evas_object_smart.c | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/lib/evas/canvas/evas_object_smart.c 
b/src/lib/evas/canvas/evas_object_smart.c
index b2d54c8..8f156c0 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -1221,11 +1221,13 @@ _smart_members_changed_check(Evas_Object *eo_obj, 
Evas_Object_Protected_Data *ob
 {
    Evas_Object_Protected_Data *o2;
 
+   if (!obj->changed) return EINA_FALSE;
+   if (!obj->smart.smart) return EINA_TRUE;
+
    if (!evas_object_is_visible(eo_obj, obj) &&
        !evas_object_was_visible(eo_obj, obj))
      return EINA_FALSE;
 
-   if (!obj->smart.smart) return EINA_TRUE;
    if (_evas_render_has_map(eo_obj, obj))
      {
         if (((obj->changed_pchange) && (obj->changed_map)) ||
@@ -1233,10 +1235,7 @@ _smart_members_changed_check(Evas_Object *eo_obj, 
Evas_Object_Protected_Data *ob
      }
 
    EINA_INLIST_FOREACH(evas_object_smart_members_get_direct(eo_obj), o2)
-     {
-        if (!o2->changed) continue;
-        if (_smart_members_changed_check(o2->object, o2)) return EINA_TRUE;
-     }
+     if (_smart_members_changed_check(o2->object, o2)) return EINA_TRUE;
 
    return EINA_FALSE;
 }
@@ -1246,18 +1245,14 @@ evas_object_smart_changed_get(Evas_Object *eo_obj)
 {
    Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS);
    Evas_Object_Protected_Data *o2;
-   Eina_Bool changed = EINA_FALSE;
 
    if (!obj->is_smart) return obj->changed;
    if (obj->changed_color) return EINA_TRUE;
 
    EINA_INLIST_FOREACH(evas_object_smart_members_get_direct(eo_obj), o2)
-     {
-        if (!o2->changed) continue;
-        changed = _smart_members_changed_check(o2->object, o2);
-        if (changed) break;
-     }
-   return changed;
+     if (_smart_members_changed_check(o2->object, o2)) return EINA_TRUE;
+
+   return EINA_FALSE;
 }
 
 void

-- 


Reply via email to