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

evas - whitespace fix

This commit is contained in:
Carsten Haitzler 2014-08-27 12:15:33 +09:00
parent 123bdc4342
commit 783f81a25f
1 changed files with 43 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/lib/evas/canvas/evas_events.c
View File

@ -206,8 +206,8 @@ _evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
if (src->is_smart) if (src->is_smart)
{ {
proxy_write->src_event_in = _evas_event_object_list_raw_in_get(eo_e, proxy_write->src_event_in = _evas_event_object_list_raw_in_get
proxy_write->src_event_in, (eo_e, proxy_write->src_event_in,
evas_object_smart_members_get_direct(eo_src), evas_object_smart_members_get_direct(eo_src),
NULL, ev->canvas.x, ev->canvas.y, &no_rep, EINA_TRUE); NULL, ev->canvas.x, ev->canvas.y, &no_rep, EINA_TRUE);
} }
@ -247,8 +247,7 @@ _evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
evas_object_event_callback_call(eo_child, child, evas_object_event_callback_call(eo_child, child,
EVAS_CALLBACK_MOUSE_DOWN, ev, event_id); EVAS_CALLBACK_MOUSE_DOWN, ev, event_id);
if (e->delete_me) break; if (e->delete_me) break;
if (obj->pointer_mode == if (obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)
EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)
break; break;
} }
eina_list_free(copy); eina_list_free(copy);
@ -1411,22 +1410,15 @@ _canvas_event_feed_mouse_move_internal(Eo *eo_e, void *_pd, int x, int y, unsign
Evas_Public_Data *e = _pd; Evas_Public_Data *e = _pd;
Evas_Object *nogrep_obj = NULL; Evas_Object *nogrep_obj = NULL;
int px, py; int px, py;
//// Evas_Coord pcx, pcy;
px = e->pointer.x; px = e->pointer.x;
py = e->pointer.y; py = e->pointer.y;
//// pcx = e->pointer.canvas_x;
//// pcy = e->pointer.canvas_y;
if (e->is_frozen) return; if (e->is_frozen) return;
e->last_timestamp = timestamp; e->last_timestamp = timestamp;
e->pointer.x = x; e->pointer.x = x;
e->pointer.y = y; e->pointer.y = y;
//// e->pointer.canvas_x = x;
//// e->pointer.canvas_y = y;
//// e->pointer.canvas_x = evas_coord_screen_x_to_world(eo_e, x);
//// e->pointer.canvas_y = evas_coord_screen_y_to_world(eo_e, y);
if ((!e->pointer.inside) && (e->pointer.mouse_grabbed == 0)) return; if ((!e->pointer.inside) && (e->pointer.mouse_grabbed == 0)) return;
_evas_walk(e); _evas_walk(e);
/* update moved touch point */ /* update moved touch point */
@ -2903,4 +2895,3 @@ _evas_canvas_event_down_count_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e)
{ {
return e->pointer.downs; return e->pointer.downs;
} }