[EGIT] [core/efl] master 01/01: evas: Remove duplicated code

[Yeongjong Lee]

raster pushed a commit to branch master.

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

commit c1e9d9f2f03518a74d57c4724a21086e0c6d70c4
Author: Yeongjong Lee <clean...@naver.com>
Date:   Wed Nov 29 11:48:21 2017 +0900

    evas: Remove duplicated code
    
    Reviewers: raster, cedric
    
    Reviewed By: raster
    
    Subscribers: jpeg
    
    Differential Revision: https://phab.enlightenment.org/D5552
---
 src/lib/evas/include/evas_inline.x | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/src/lib/evas/include/evas_inline.x 
b/src/lib/evas/include/evas_inline.x
index 69ea105c1a..fd00dbe2aa 100644
--- a/src/lib/evas/include/evas_inline.x
+++ b/src/lib/evas/include/evas_inline.x
@@ -230,25 +230,14 @@ evas_object_is_active(Evas_Object *eo_obj, 
Evas_Object_Protected_Data *obj)
         int fx, fy;
         fx = e->framespace.x;
         fy = e->framespace.y;
-        if (obj->is_smart)
-          {
-             int mapsmt = 0;
-             if (obj->map->cur.map && obj->map->cur.usemap) mapsmt = 1;
-             if (!mapsmt) return 1;
-             if (evas_object_is_in_output_rect(eo_obj, obj, -fx, -fy,
-                                               e->output.w, e->output.h) ||
-                 evas_object_was_in_output_rect(eo_obj, obj, -fx, -fy,
-                                                e->output.w, e->output.h))
-               return 1;
-          }
-        else
-          {
-             if (evas_object_is_in_output_rect(eo_obj, obj, -fx, -fy,
-                                               e->output.w, e->output.h) ||
-                 evas_object_was_in_output_rect(eo_obj, obj, -fx, -fy,
-                                                e->output.w, e->output.h))
-               return 1;
-          }
+        if (obj->is_smart && !(obj->map->cur.map && obj->map->cur.usemap))
+          return 1;
+
+        if (evas_object_is_in_output_rect(eo_obj, obj, -fx, -fy,
+                                          e->output.w, e->output.h) ||
+            evas_object_was_in_output_rect(eo_obj, obj, -fx, -fy,
+                                           e->output.w, e->output.h))
+          return 1;
      }
    /* FIXME: forcing object with proxies to stay active,
       need to be smarter and only do that when really needed. */

--