summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-08-25 11:34:45 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-08-25 13:21:25 +0100
commit77b3d11c8df446826687556ebc7f6b2b1f79d7e1 (patch)
tree6a4730ffdb81ec926ee589dd7aa45497388cecc6
parent76701f606c82727c56e614dd68fdd65a5ce8d1e1 (diff)
evas - callbacks - fix casting warnings - checked flags are the same
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index aca5d31181..784458fd8b 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -193,7 +193,8 @@ _eo_evas_object_cb(void *data, const Efl_Event *event)
193 if (event_flags) evflags = *event_flags; 193 if (event_flags) evflags = *event_flags;
194 info->func.object_cb(info->data, evas, event->object, event_info); 194 info->func.object_cb(info->data, evas, event->object, event_info);
195 if (event_flags && (evflags != *event_flags)) 195 if (event_flags && (evflags != *event_flags))
196 efl_input_event_flags_set(efl_event_info, *event_flags); 196 efl_input_event_flags_set(efl_event_info,
197 (Efl_Input_Flags)*event_flags);
197} 198}
198 199
199static void 200static void
@@ -403,7 +404,7 @@ evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data
403 404
404 if ((type == EVAS_CALLBACK_MOUSE_DOWN) || (type == EVAS_CALLBACK_MOUSE_UP)) 405 if ((type == EVAS_CALLBACK_MOUSE_DOWN) || (type == EVAS_CALLBACK_MOUSE_UP))
405 { 406 {
406 flags = efl_input_pointer_button_flags_get(event_info); 407 flags = (Evas_Button_Flags)efl_input_pointer_button_flags_get(event_info);
407 if (flags & CLICK_MASK) 408 if (flags & CLICK_MASK)
408 { 409 {
409 if (obj->last_mouse_down_counter < (e->last_mouse_down_counter - 1)) 410 if (obj->last_mouse_down_counter < (e->last_mouse_down_counter - 1))
@@ -432,7 +433,7 @@ evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data
432 e->current_event = EVAS_CALLBACK_MULTI_DOWN; 433 e->current_event = EVAS_CALLBACK_MULTI_DOWN;
433 efl_event_callback_call(eo_obj, EFL_EVENT_FINGER_DOWN, event_info); 434 efl_event_callback_call(eo_obj, EFL_EVENT_FINGER_DOWN, event_info);
434 } 435 }
435 efl_input_pointer_button_flags_set(event_info, flags); 436 efl_input_pointer_button_flags_set(event_info, (Efl_Pointer_Flags) flags);
436 } 437 }
437 else if (type == EVAS_CALLBACK_MOUSE_UP) 438 else if (type == EVAS_CALLBACK_MOUSE_UP)
438 { 439 {
@@ -441,7 +442,7 @@ evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data
441 e->current_event = EVAS_CALLBACK_MULTI_UP; 442 e->current_event = EVAS_CALLBACK_MULTI_UP;
442 efl_event_callback_call(eo_obj, EFL_EVENT_FINGER_UP, event_info); 443 efl_event_callback_call(eo_obj, EFL_EVENT_FINGER_UP, event_info);
443 } 444 }
444 efl_input_pointer_button_flags_set(event_info, flags); 445 efl_input_pointer_button_flags_set(event_info, (Efl_Pointer_Flags)flags);
445 } 446 }
446 else if (type == EVAS_CALLBACK_MOUSE_MOVE) 447 else if (type == EVAS_CALLBACK_MOUSE_MOVE)
447 { 448 {