summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2017-08-01 13:29:46 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2017-08-01 13:29:46 -0400
commitf6c465dc5971a0ae0505c74ab010bcd8c6fc5101 (patch)
treecd24eb71ba79ea4efb0d342211e03c0140f8ca66
parentaca00f85021204bf18a536e271f7525781ff956b (diff)
Revert "evas: Always call show/hide intercept"
This reverts commit 936ea58cb9ac3e93aaabb6ec731fc3845cf95826. this is an ideal change, but it breaks previously-expected behaviors for interceptors and thus enlightenment is completely broken
-rw-r--r--src/lib/evas/canvas/evas_object_intercept.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/lib/evas/canvas/evas_object_intercept.c b/src/lib/evas/canvas/evas_object_intercept.c
index fc482ad222..2a37ac2f1a 100644
--- a/src/lib/evas/canvas/evas_object_intercept.c
+++ b/src/lib/evas/canvas/evas_object_intercept.c
@@ -100,13 +100,10 @@ _evas_object_intercept_call_internal(Evas_Object *eo_obj,
100 { 100 {
101 case EVAS_OBJECT_INTERCEPT_CB_VISIBLE: 101 case EVAS_OBJECT_INTERCEPT_CB_VISIBLE:
102 i = !!va_arg(args, int); 102 i = !!va_arg(args, int);
103 if (obj->interceptors) 103 if (i == obj->cur->visible) return 1;
104 { 104 if (!obj->interceptors) return 0;
105 if (i) blocked = evas_object_intercept_call_show(eo_obj, obj); 105 if (i) blocked = evas_object_intercept_call_show(eo_obj, obj);
106 else blocked = evas_object_intercept_call_hide(eo_obj, obj); 106 else blocked = evas_object_intercept_call_hide(eo_obj, obj);
107 }
108 if (!blocked && (i == obj->cur->visible))
109 blocked = 1;
110 break; 107 break;
111 108
112 case EVAS_OBJECT_INTERCEPT_CB_MOVE: 109 case EVAS_OBJECT_INTERCEPT_CB_MOVE: