summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYeongjong Lee <cleanlyj@naver.com>2017-11-29 11:48:21 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-11-29 11:59:54 +0900
commitc1e9d9f2f03518a74d57c4724a21086e0c6d70c4 (patch)
tree0d5cc1bf528f12bc4e892c8dc0afbfae6c2ddfb1
parent6946ff631876ee8c1e034a3eb4e8d7e552ef6153 (diff)
evas: Remove duplicated code
Reviewers: raster, cedric Reviewed By: raster Subscribers: jpeg Differential Revision: https://phab.enlightenment.org/D5552
-rw-r--r--src/lib/evas/include/evas_inline.x27
1 files 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)
230 int fx, fy; 230 int fx, fy;
231 fx = e->framespace.x; 231 fx = e->framespace.x;
232 fy = e->framespace.y; 232 fy = e->framespace.y;
233 if (obj->is_smart) 233 if (obj->is_smart && !(obj->map->cur.map && obj->map->cur.usemap))
234 { 234 return 1;
235 int mapsmt = 0; 235
236 if (obj->map->cur.map && obj->map->cur.usemap) mapsmt = 1; 236 if (evas_object_is_in_output_rect(eo_obj, obj, -fx, -fy,
237 if (!mapsmt) return 1; 237 e->output.w, e->output.h) ||
238 if (evas_object_is_in_output_rect(eo_obj, obj, -fx, -fy, 238 evas_object_was_in_output_rect(eo_obj, obj, -fx, -fy,
239 e->output.w, e->output.h) || 239 e->output.w, e->output.h))
240 evas_object_was_in_output_rect(eo_obj, obj, -fx, -fy, 240 return 1;
241 e->output.w, e->output.h))
242 return 1;
243 }
244 else
245 {
246 if (evas_object_is_in_output_rect(eo_obj, obj, -fx, -fy,
247 e->output.w, e->output.h) ||
248 evas_object_was_in_output_rect(eo_obj, obj, -fx, -fy,
249 e->output.w, e->output.h))
250 return 1;
251 }
252 } 241 }
253 /* FIXME: forcing object with proxies to stay active, 242 /* FIXME: forcing object with proxies to stay active,
254 need to be smarter and only do that when really needed. */ 243 need to be smarter and only do that when really needed. */