diff options
| author | Derek Foreman <derekf@osg.samsung.com> | 2017-03-09 07:42:28 -0600 |
|---|---|---|
| committer | Derek Foreman <derekf@osg.samsung.com> | 2017-03-09 07:42:28 -0600 |
| commit | 033187c1d38388fd986f2771d7863606b47f42a5 (patch) | |
| tree | 8a8e2e84de1a6d22ce643ece9dfac11f04ecf755 /src/lib/ecore_input_evas | |
| parent | evas filters: Save selected render op of the final object (diff) | |
| download | efl-033187c1d38388fd986f2771d7863606b47f42a5.tar.gz | |
Revert "ecore_input - dont try update modifiers and locks on mouse events"
This reverts commit f654714d75afdd07ad851bf278a39ddf8de6caba.
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.
Diffstat (limited to 'src/lib/ecore_input_evas')
| -rw-r--r-- | src/lib/ecore_input_evas/ecore_input_evas.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/lib/ecore_input_evas/ecore_input_evas.c b/src/lib/ecore_input_evas/ecore_input_evas.c index 28d06e06e0..7866bd5d9a 100644 --- a/src/lib/ecore_input_evas/ecore_input_evas.c +++ b/src/lib/ecore_input_evas/ecore_input_evas.c @@ -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)) { |