summaryrefslogtreecommitdiff
path: root/src/lib/evas/include
diff options
context:
space:
mode:
authorCedric Bail <cedric.bail@samsung.com>2013-08-29 14:25:23 +0900
committerCedric Bail <cedric.bail@samsung.com>2013-08-29 14:25:23 +0900
commitbcb9ccb1291d2e67d91d620d21b187d9854399d8 (patch)
tree92d6c7a9506d27245f44dac868caef40080f0aa1 /src/lib/evas/include
parent35b98861dd6b3d3fe325746e12d2194649618980 (diff)
evas: let's allow intercept of other type of operation on the same object during an intercept.
Diffstat (limited to 'src/lib/evas/include')
-rw-r--r--src/lib/evas/include/evas_private.h18
1 files changed, 15 insertions, 3 deletions
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index 870e1474aa..5a9867b120 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -193,54 +193,67 @@ struct _Evas_Intercept_Func
193 struct { 193 struct {
194 Evas_Object_Intercept_Show_Cb func; 194 Evas_Object_Intercept_Show_Cb func;
195 void *data; 195 void *data;
196 Eina_Bool intercepted;
196 } show; 197 } show;
197 struct { 198 struct {
198 Evas_Object_Intercept_Hide_Cb func; 199 Evas_Object_Intercept_Hide_Cb func;
199 void *data; 200 void *data;
201 Eina_Bool intercepted;
200 } hide; 202 } hide;
201 struct { 203 struct {
202 Evas_Object_Intercept_Move_Cb func; 204 Evas_Object_Intercept_Move_Cb func;
203 void *data; 205 void *data;
206 Eina_Bool intercepted;
204 } move; 207 } move;
205 struct { 208 struct {
206 Evas_Object_Intercept_Resize_Cb func; 209 Evas_Object_Intercept_Resize_Cb func;
207 void *data; 210 void *data;
211 Eina_Bool intercepted;
208 } resize; 212 } resize;
209 struct { 213 struct {
210 Evas_Object_Intercept_Raise_Cb func; 214 Evas_Object_Intercept_Raise_Cb func;
211 void *data; 215 void *data;
216 Eina_Bool intercepted;
212 } raise; 217 } raise;
213 struct { 218 struct {
214 Evas_Object_Intercept_Lower_Cb func; 219 Evas_Object_Intercept_Lower_Cb func;
215 void *data; 220 void *data;
221 Eina_Bool intercepted;
216 } lower; 222 } lower;
217 struct { 223 struct {
218 Evas_Object_Intercept_Stack_Above_Cb func; 224 Evas_Object_Intercept_Stack_Above_Cb func;
219 void *data; 225 void *data;
226 Eina_Bool intercepted;
220 } stack_above; 227 } stack_above;
221 struct { 228 struct {
222 Evas_Object_Intercept_Stack_Below_Cb func; 229 Evas_Object_Intercept_Stack_Below_Cb func;
223 void *data; 230 void *data;
231 Eina_Bool intercepted;
224 } stack_below; 232 } stack_below;
225 struct { 233 struct {
226 Evas_Object_Intercept_Layer_Set_Cb func; 234 Evas_Object_Intercept_Layer_Set_Cb func;
227 void *data; 235 void *data;
236 Eina_Bool intercepted;
228 } layer_set; 237 } layer_set;
229 struct { 238 struct {
230 Evas_Object_Intercept_Color_Set_Cb func; 239 Evas_Object_Intercept_Color_Set_Cb func;
231 void *data; 240 void *data;
241 Eina_Bool intercepted;
232 } color_set; 242 } color_set;
233 struct { 243 struct {
234 Evas_Object_Intercept_Clip_Set_Cb func; 244 Evas_Object_Intercept_Clip_Set_Cb func;
235 void *data; 245 void *data;
246 Eina_Bool intercepted;
236 } clip_set; 247 } clip_set;
237 struct { 248 struct {
238 Evas_Object_Intercept_Clip_Unset_Cb func; 249 Evas_Object_Intercept_Clip_Unset_Cb func;
239 void *data; 250 void *data;
251 Eina_Bool intercepted;
240 } clip_unset; 252 } clip_unset;
241 struct { 253 struct {
242 Evas_Object_Intercept_Focus_Set_Cb func; 254 Evas_Object_Intercept_Focus_Set_Cb func;
243 void *data; 255 void *data;
256 Eina_Bool intercepted;
244 } focus_set; 257 } focus_set;
245}; 258};
246 259
@@ -637,10 +650,9 @@ struct _Evas_Object_Protected_Data
637 Eina_Bool rect_del : 1; 650 Eina_Bool rect_del : 1;
638 Eina_Bool mouse_in : 1; 651 Eina_Bool mouse_in : 1;
639 Eina_Bool pre_render_done : 1; 652 Eina_Bool pre_render_done : 1;
640 Eina_Bool intercepted : 1;
641 Eina_Bool focused : 1; 653 Eina_Bool focused : 1;
642
643 Eina_Bool in_layer : 1; 654 Eina_Bool in_layer : 1;
655
644 Eina_Bool no_propagate : 1; 656 Eina_Bool no_propagate : 1;
645 Eina_Bool changed : 1; 657 Eina_Bool changed : 1;
646 Eina_Bool changed_move : 1; 658 Eina_Bool changed_move : 1;
@@ -648,8 +660,8 @@ struct _Evas_Object_Protected_Data
648 Eina_Bool changed_map : 1; 660 Eina_Bool changed_map : 1;
649 Eina_Bool changed_pchange : 1; 661 Eina_Bool changed_pchange : 1;
650 Eina_Bool changed_src_visible : 1; 662 Eina_Bool changed_src_visible : 1;
651
652 Eina_Bool del_ref : 1; 663 Eina_Bool del_ref : 1;
664
653 Eina_Bool is_frame : 1; 665 Eina_Bool is_frame : 1;
654 Eina_Bool child_has_map : 1; 666 Eina_Bool child_has_map : 1;
655 Eina_Bool eo_del_called : 1; 667 Eina_Bool eo_del_called : 1;