rggammon
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

evas: let's allow intercept of other type of operation on the same object during an intercept.

This commit is contained in:
Cedric Bail 2013-08-29 14:25:23 +09:00
parent 35b98861dd
commit bcb9ccb129
2 changed files with 39 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/lib/evas/canvas/evas_object_intercept.c
View File

@ -53,12 +53,12 @@ evas_object_intercept_cleanup(Evas_Object *eo_obj)
int ret; \
\
if (!obj->interceptors) return 0; \
if (obj->intercepted) return 0; \
obj->intercepted = EINA_TRUE; \
if (obj->interceptors->Type.intercepted) return 0; \
obj->interceptors->Type.intercepted = EINA_TRUE; \
ret = !!(obj->interceptors->Type.func); \
if (ret) \
obj->interceptors->Type.func(obj->interceptors->Type.data, eo_obj); \
obj->intercepted = EINA_FALSE; \
obj->interceptors->Type.intercepted = EINA_FALSE; \
return ret; \
}
@ -76,13 +76,13 @@ EVAS_OBJECT_INTERCEPT_CALL_SIMPLE(lower);
int ret; \
\
if (!obj->interceptors) return 0; \
if (obj->intercepted) return 0; \
obj->intercepted = EINA_TRUE; \
if (obj->interceptors->Type.intercepted) return 0; \
obj->interceptors->Type.intercepted = EINA_TRUE; \
ret = !!(obj->interceptors->Type.func); \
if (ret) \
obj->interceptors->Type.func(obj->interceptors->Type.data, \
eo_obj, a , b); \
obj->intercepted = EINA_FALSE; \
obj->interceptors->Type.intercepted = EINA_FALSE; \
return ret; \
}
@ -98,13 +98,13 @@ EVAS_OBJECT_INTERCEPT_CALL_GEOMETRY(resize);
int ret; \
\
if (!obj->interceptors) return 0; \
if (obj->intercepted) return 0; \
obj->intercepted = EINA_TRUE; \
if (obj->interceptors->Type.intercepted) return 0; \
obj->interceptors->Type.intercepted = EINA_TRUE; \
ret = !!(obj->interceptors->Type.func); \
if (ret) \
obj->interceptors->Type.func(obj->interceptors->Type.data, \
eo_obj, rel_to); \
obj->intercepted = EINA_FALSE; \
obj->interceptors->Type.intercepted = EINA_FALSE; \
return ret; \
}
@ -119,12 +119,12 @@ evas_object_intercept_call_layer_set(Evas_Object *eo_obj,
int ret;
if (!obj->interceptors) return 0;
if (obj->intercepted) return 0;
obj->intercepted = EINA_TRUE;
if (obj->interceptors->layer_set.intercepted) return 0;
obj->interceptors->layer_set.intercepted = EINA_TRUE;
ret = !!(obj->interceptors->layer_set.func);
if (ret)
obj->interceptors->layer_set.func(obj->interceptors->layer_set.data, eo_obj, l);
obj->intercepted = EINA_FALSE;
obj->interceptors->layer_set.intercepted = EINA_FALSE;
return ret;
}
@ -136,12 +136,12 @@ evas_object_intercept_call_focus_set(Evas_Object *eo_obj,
int ret;
if (!obj->interceptors) return 0;
if (obj->intercepted) return 0;
obj->intercepted = EINA_TRUE;
if (obj->interceptors->focus_set.intercepted) return 0;
obj->interceptors->focus_set.intercepted = EINA_TRUE;
ret = !!(obj->interceptors->focus_set.func);
if (ret)
obj->interceptors->focus_set.func(obj->interceptors->focus_set.data, eo_obj, focus);
obj->intercepted = EINA_FALSE;
obj->interceptors->focus_set.intercepted = EINA_FALSE;
return ret;
}
@ -154,12 +154,12 @@ evas_object_intercept_call_color_set(Evas_Object *eo_obj,
int ret;
if (!obj->interceptors) return 0;
if (obj->intercepted) return 0;
obj->intercepted = EINA_TRUE;
if (obj->interceptors->color_set.intercepted) return 0;
obj->interceptors->color_set.intercepted = EINA_TRUE;
ret = !!(obj->interceptors->color_set.func);
if (ret)
obj->interceptors->color_set.func(obj->interceptors->color_set.data, eo_obj, r, g, b, a);
obj->intercepted = EINA_FALSE;
obj->interceptors->color_set.intercepted = EINA_FALSE;
return ret;
}
@ -169,12 +169,12 @@ evas_object_intercept_call_clip_set(Evas_Object *eo_obj, Evas_Object_Protected_D
int ret;
if (!obj->interceptors) return 0;
if (obj->intercepted) return 0;
obj->intercepted = EINA_TRUE;
if (obj->interceptors->clip_set.intercepted) return 0;
obj->interceptors->clip_set.intercepted = EINA_TRUE;
ret = !!(obj->interceptors->clip_set.func);
if (ret)
obj->interceptors->clip_set.func(obj->interceptors->clip_set.data, eo_obj, clip);
obj->intercepted = EINA_FALSE;
obj->interceptors->clip_set.intercepted = EINA_FALSE;
return ret;
}
@ -184,12 +184,12 @@ evas_object_intercept_call_clip_unset(Evas_Object *eo_obj, Evas_Object_Protected
int ret;
if (!obj->interceptors) return 0;
if (obj->intercepted) return 0;
obj->intercepted = EINA_TRUE;
if (obj->interceptors->clip_unset.intercepted) return 0;
obj->interceptors->clip_unset.intercepted = EINA_TRUE;
ret = !!(obj->interceptors->clip_unset.func);
if (ret)
obj->interceptors->clip_unset.func(obj->interceptors->clip_unset.data, eo_obj);
obj->intercepted = EINA_FALSE;
obj->interceptors->clip_unset.intercepted = EINA_FALSE;
return ret;
}

18
src/lib/evas/include/evas_private.h
View File

@ -193,54 +193,67 @@ struct _Evas_Intercept_Func
struct {
Evas_Object_Intercept_Show_Cb func;
void *data;
Eina_Bool intercepted;
} show;
struct {
Evas_Object_Intercept_Hide_Cb func;
void *data;
Eina_Bool intercepted;
} hide;
struct {
Evas_Object_Intercept_Move_Cb func;
void *data;
Eina_Bool intercepted;
} move;
struct {
Evas_Object_Intercept_Resize_Cb func;
void *data;
Eina_Bool intercepted;
} resize;
struct {
Evas_Object_Intercept_Raise_Cb func;
void *data;
Eina_Bool intercepted;
} raise;
struct {
Evas_Object_Intercept_Lower_Cb func;
void *data;
Eina_Bool intercepted;
} lower;
struct {
Evas_Object_Intercept_Stack_Above_Cb func;
void *data;
Eina_Bool intercepted;
} stack_above;
struct {
Evas_Object_Intercept_Stack_Below_Cb func;
void *data;
Eina_Bool intercepted;
} stack_below;
struct {
Evas_Object_Intercept_Layer_Set_Cb func;
void *data;
Eina_Bool intercepted;
} layer_set;
struct {
Evas_Object_Intercept_Color_Set_Cb func;
void *data;
Eina_Bool intercepted;
} color_set;
struct {
Evas_Object_Intercept_Clip_Set_Cb func;
void *data;
Eina_Bool intercepted;
} clip_set;
struct {
Evas_Object_Intercept_Clip_Unset_Cb func;
void *data;
Eina_Bool intercepted;
} clip_unset;
struct {
Evas_Object_Intercept_Focus_Set_Cb func;
void *data;
Eina_Bool intercepted;
} focus_set;
};
@ -637,10 +650,9 @@ struct _Evas_Object_Protected_Data
Eina_Bool rect_del : 1;
Eina_Bool mouse_in : 1;
Eina_Bool pre_render_done : 1;
Eina_Bool intercepted : 1;
Eina_Bool focused : 1;
Eina_Bool in_layer : 1;
Eina_Bool no_propagate : 1;
Eina_Bool changed : 1;
Eina_Bool changed_move : 1;
@ -648,8 +660,8 @@ struct _Evas_Object_Protected_Data
Eina_Bool changed_map : 1;
Eina_Bool changed_pchange : 1;
Eina_Bool changed_src_visible : 1;
Eina_Bool del_ref : 1;
Eina_Bool is_frame : 1;
Eina_Bool child_has_map : 1;
Eina_Bool eo_del_called : 1;