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

elm_win: Remove move stop callback 

Summary:
This is only fired to trigger a cursor set under wayland, but that cursor
set should be done unconditionally on mouse in.

However, mouse in was being discarded because mouse out was being deferred
when the window was "grabbed" for moving.

If instead we just let the mouse out occur as it should, the cursor
is properly updated on mouse in.
Depends on D6118

Reviewers: zmike, cedric

Reviewed By: zmike

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D6119
This commit is contained in:
Derek Foreman 2018-05-08 13:25:54 -05:00
parent cad847cf13
commit 77f946a92c
2 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lib/ecore_wl2/ecore_wl2_input.c
View File

@ -745,9 +745,6 @@ _pointer_cb_leave(void *data, struct wl_pointer *pointer EINA_UNUSED, unsigned i
window = _ecore_wl2_display_window_surface_find(input->display, surface);
if (!window) return;
/* NB: Don't send a mouse out if we grabbed this window for moving */
if ((window->moving) && (input->grab.window == window)) return;
_ecore_wl2_input_mouse_out_send(input, window);
}

19
src/lib/elementary/efl_ui_win.c
View File

@ -4170,19 +4170,6 @@ _elm_win_frame_cb_move_start(void *data,
_win_move_resize_start(sd, EFL_UI_WIN_MOVE_RESIZE_MOVE);
}
static void
_elm_win_frame_cb_move_stop(void *data,
Evas_Object *obj EINA_UNUSED,
const char *sig EINA_UNUSED,
const char *source EINA_UNUSED)
{
ELM_WIN_DATA_GET_OR_RETURN(data, sd);
#ifdef HAVE_ELEMENTARY_WL2
_elm_win_wl_cursor_set(sd->obj, NULL);
#endif
}
static void
_elm_win_frame_cb_resize_start(void *data, Evas_Object *obj EINA_UNUSED,
const char *sig EINA_UNUSED, const char *source)
@ -4423,9 +4410,6 @@ _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *element, const char *style)
edje_object_signal_callback_add
(sd->frame_obj, "elm,action,move,start", "elm",
_elm_win_frame_cb_move_start, obj);
edje_object_signal_callback_add
(sd->frame_obj, "elm,action,move,stop", "elm",
_elm_win_frame_cb_move_stop, obj);
edje_object_signal_callback_add
(sd->frame_obj, "elm,action,resize,show", "*",
_elm_win_frame_cb_resize_show, obj);
@ -4453,9 +4437,6 @@ _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *element, const char *style)
edje_object_signal_callback_add
(sd->frame_obj, "efl,action,move,start", "efl",
_elm_win_frame_cb_move_start, obj);
edje_object_signal_callback_add
(sd->frame_obj, "efl,action,move,stop", "efl",
_elm_win_frame_cb_move_stop, obj);
edje_object_signal_callback_add
(sd->frame_obj, "efl,action,resize,show", "*",
_elm_win_frame_cb_resize_show, obj);