From 0c0a34fbd9e4413c8a17d2944c7dd1db71e775cc Mon Sep 17 00:00:00 2001 From: ChunEon Park Date: Thu, 15 Dec 2011 09:56:25 +0000 Subject: [PATCH] evas - simplified instructions SVN revision: 66248 --- .../src/lib/canvas/evas_object_intercept.c | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/legacy/evas/src/lib/canvas/evas_object_intercept.c b/legacy/evas/src/lib/canvas/evas_object_intercept.c index 5085b657dc..54f7265744 100644 --- a/legacy/evas/src/lib/canvas/evas_object_intercept.c +++ b/legacy/evas/src/lib/canvas/evas_object_intercept.c @@ -51,7 +51,7 @@ evas_object_intercept_call_show(Evas_Object *obj) if (obj->intercepted) return 0; obj->intercepted = EINA_TRUE; ret = !!(obj->interceptors->show.func); - if (obj->interceptors->show.func) + if (ret) obj->interceptors->show.func(obj->interceptors->show.data, obj); obj->intercepted = EINA_FALSE; return ret; @@ -66,7 +66,7 @@ evas_object_intercept_call_hide(Evas_Object *obj) if (obj->intercepted) return 0; obj->intercepted = EINA_TRUE; ret = !!(obj->interceptors->hide.func); - if (obj->interceptors->hide.func) + if (ret) obj->interceptors->hide.func(obj->interceptors->hide.data, obj); obj->intercepted = EINA_FALSE; return ret; @@ -81,7 +81,7 @@ evas_object_intercept_call_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y) if (obj->intercepted) return 0; obj->intercepted = EINA_TRUE; ret = !!(obj->interceptors->move.func); - if (obj->interceptors->move.func) + if (ret) obj->interceptors->move.func(obj->interceptors->move.data, obj, x, y); obj->intercepted = EINA_FALSE; return ret; @@ -96,7 +96,7 @@ evas_object_intercept_call_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h) if (obj->intercepted) return 0; obj->intercepted = EINA_TRUE; ret = !!(obj->interceptors->resize.func); - if (obj->interceptors->resize.func) + if (ret) obj->interceptors->resize.func(obj->interceptors->resize.data, obj, w, h); obj->intercepted = EINA_FALSE; return ret; @@ -111,7 +111,7 @@ evas_object_intercept_call_raise(Evas_Object *obj) if (obj->intercepted) return 0; obj->intercepted = EINA_TRUE; ret = !!(obj->interceptors->raise.func); - if (obj->interceptors->raise.func) + if (ret) obj->interceptors->raise.func(obj->interceptors->raise.data, obj); obj->intercepted = EINA_FALSE; return ret; @@ -126,7 +126,7 @@ evas_object_intercept_call_lower(Evas_Object *obj) if (obj->intercepted) return 0; obj->intercepted = EINA_TRUE; ret = !!(obj->interceptors->lower.func); - if (obj->interceptors->lower.func) + if (ret) obj->interceptors->lower.func(obj->interceptors->lower.data, obj); obj->intercepted = EINA_FALSE; return ret; @@ -141,7 +141,7 @@ evas_object_intercept_call_stack_above(Evas_Object *obj, Evas_Object *above) if (obj->intercepted) return 0; obj->intercepted = EINA_TRUE; ret = !!(obj->interceptors->stack_above.func); - if (obj->interceptors->stack_above.func) + if (ret) obj->interceptors->stack_above.func(obj->interceptors->stack_above.data, obj, above); obj->intercepted = EINA_FALSE; return ret; @@ -156,7 +156,7 @@ evas_object_intercept_call_stack_below(Evas_Object *obj, Evas_Object *below) if (obj->intercepted) return 0; obj->intercepted = EINA_TRUE; ret = !!(obj->interceptors->stack_below.func); - if (obj->interceptors->stack_below.func) + if (ret) obj->interceptors->stack_below.func(obj->interceptors->stack_below.data, obj, below); obj->intercepted = EINA_FALSE; return ret; @@ -171,7 +171,7 @@ evas_object_intercept_call_layer_set(Evas_Object *obj, int l) if (obj->intercepted) return 0; obj->intercepted = EINA_TRUE; ret = !!(obj->interceptors->layer_set.func); - if (obj->interceptors->layer_set.func) + if (ret) obj->interceptors->layer_set.func(obj->interceptors->layer_set.data, obj, l); obj->intercepted = EINA_FALSE; return ret; @@ -186,7 +186,7 @@ evas_object_intercept_call_color_set(Evas_Object *obj, int r, int g, int b, int if (obj->intercepted) return 0; obj->intercepted = EINA_TRUE; ret = !!(obj->interceptors->color_set.func); - if (obj->interceptors->color_set.func) + if (ret) obj->interceptors->color_set.func(obj->interceptors->color_set.data, obj, r, g, b, a); obj->intercepted = EINA_FALSE; return ret; @@ -201,7 +201,7 @@ evas_object_intercept_call_clip_set(Evas_Object *obj, Evas_Object *clip) if (obj->intercepted) return 0; obj->intercepted = EINA_TRUE; ret = !!(obj->interceptors->clip_set.func); - if (obj->interceptors->clip_set.func) + if (ret) obj->interceptors->clip_set.func(obj->interceptors->clip_set.data, obj, clip); obj->intercepted = EINA_FALSE; return ret; @@ -216,7 +216,7 @@ evas_object_intercept_call_clip_unset(Evas_Object *obj) if (obj->intercepted) return 0; obj->intercepted = EINA_TRUE; ret = !!(obj->interceptors->clip_unset.func); - if (obj->interceptors->clip_unset.func) + if (ret) obj->interceptors->clip_unset.func(obj->interceptors->clip_unset.data, obj); obj->intercepted = EINA_FALSE; return ret;