Revert "evas: Always call show/hide intercept"
authorMike Blumenkrantz <zmike@osg.samsung.com>
Tue, 1 Aug 2017 17:29:46 +0000 (13:29 -0400)
committerMike Blumenkrantz <zmike@osg.samsung.com>
Tue, 1 Aug 2017 17:29:46 +0000 (13:29 -0400)
This reverts commit 936ea58cb9ac3e93aaabb6ec731fc3845cf95826.

this is an ideal change, but it breaks previously-expected behaviors
for interceptors and thus enlightenment is completely broken

src/lib/evas/canvas/evas_object_intercept.c

index fc482ad..2a37ac2 100644 (file)
@@ -100,13 +100,10 @@ _evas_object_intercept_call_internal(Evas_Object *eo_obj,
      {
       case EVAS_OBJECT_INTERCEPT_CB_VISIBLE:
         i = !!va_arg(args, int);
-        if (obj->interceptors)
-          {
-             if (i) blocked = evas_object_intercept_call_show(eo_obj, obj);
-             else blocked = evas_object_intercept_call_hide(eo_obj, obj);
-          }
-        if (!blocked && (i == obj->cur->visible))
-          blocked = 1;
+        if (i == obj->cur->visible) return 1;
+        if (!obj->interceptors) return 0;
+        if (i) blocked = evas_object_intercept_call_show(eo_obj, obj);
+        else blocked = evas_object_intercept_call_hide(eo_obj, obj);
         break;
 
       case EVAS_OBJECT_INTERCEPT_CB_MOVE: