derekf pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=77f946a92c24e89b486be6508a0c494c8f98f66b
commit 77f946a92c24e89b486be6508a0c494c8f98f66b
Author: Derek Foreman <der...@osg.samsung.com>
Date: Tue May 8 13:25:54 2018 -0500
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
---
src/lib/ecore_wl2/ecore_wl2_input.c | 3 ---
src/lib/elementary/efl_ui_win.c | 19 -------------------
2 files changed, 22 deletions(-)
diff --git a/src/lib/ecore_wl2/ecore_wl2_input.c
b/src/lib/ecore_wl2/ecore_wl2_input.c
index 256dd45c15..71a537c8f0 100644
--- a/src/lib/ecore_wl2/ecore_wl2_input.c
+++ b/src/lib/ecore_wl2/ecore_wl2_input.c
@@ -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);
}
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index f273b7dc4f..f5ce3b7d3d 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -4171,19 +4171,6 @@ _elm_win_frame_cb_move_start(void *data,
}
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)
{
@@ -4424,9 +4411,6 @@ _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char
*element, const char *style)
(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);
edje_object_signal_callback_add
@@ -4454,9 +4438,6 @@ _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char
*element, const char *style)
(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);
edje_object_signal_callback_add
--
