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

Revert "ecore_input - dont try update modifiers and locks on mouse events" 

This reverts commit f654714d75.

Modifiers do influence mouse events, though a mouse input can't change them...

This commit broke modifer+drag on windows in E, so I'm reverting it.
This commit is contained in:
Derek Foreman 2017-03-09 07:42:28 -06:00
parent 815e53ee35
commit 033187c1d3
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/lib/ecore_input_evas/ecore_input_evas.c
View File

@ -531,6 +531,9 @@ _ecore_event_evas_mouse_button(Ecore_Event_Mouse_Button *e, Ecore_Event_Press pr
if (e->multi.device == 0)
{
ecore_event_evas_seat_modifier_lock_update(lookup->evas,
e->modifiers,
efl_input_device_seat_get(e->dev));
if (press == ECORE_DOWN)
{
if (!lookup->direct ||
@ -610,6 +613,9 @@ ecore_event_evas_mouse_move(void *data EINA_UNUSED, int type EINA_UNUSED, void *
if (e->multi.device == 0)
{
_ecore_event_evas_push_mouse_move(e);
ecore_event_evas_seat_modifier_lock_update(lookup->evas,
e->modifiers,
efl_input_device_seat_get(e->dev));
if (!lookup->direct ||
!lookup->direct(lookup->window, ECORE_EVENT_MOUSE_MOVE, e))
{
@ -668,6 +674,9 @@ _ecore_event_evas_mouse_io(Ecore_Event_Mouse_IO *e, Ecore_Event_IO io)
lookup = _ecore_event_window_match(e->event_window);
if (!lookup) return ECORE_CALLBACK_PASS_ON;
ecore_event_evas_seat_modifier_lock_update(lookup->evas,
e->modifiers,
efl_input_device_seat_get(e->dev));
switch (io)
{
case ECORE_IN:
@ -713,6 +722,8 @@ ecore_event_evas_mouse_wheel(void *data EINA_UNUSED, int type EINA_UNUSED, void
e = event;
lookup = _ecore_event_window_match(e->event_window);
if (!lookup) return ECORE_CALLBACK_PASS_ON;
ecore_event_evas_seat_modifier_lock_update(lookup->evas, e->modifiers,
efl_input_device_seat_get(e->dev));
if (!lookup->direct ||
!lookup->direct(lookup->window, ECORE_EVENT_MOUSE_WHEEL, e))
{