summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDerek Foreman <derekf@osg.samsung.com>2018-05-08 13:25:54 -0500
committerDerek Foreman <derekf@osg.samsung.com>2018-05-08 13:25:54 -0500
commit77f946a92c24e89b486be6508a0c494c8f98f66b (patch)
tree24359976434f7f972a5c2805e82e49de79571544 /src
parentcad847cf1349185877ef24e9db5a7aff4cb70c83 (diff)
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
Diffstat (limited to 'src')
-rw-r--r--src/lib/ecore_wl2/ecore_wl2_input.c3
-rw-r--r--src/lib/elementary/efl_ui_win.c19
2 files changed, 0 insertions, 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
745 window = _ecore_wl2_display_window_surface_find(input->display, surface); 745 window = _ecore_wl2_display_window_surface_find(input->display, surface);
746 if (!window) return; 746 if (!window) return;
747 747
748 /* NB: Don't send a mouse out if we grabbed this window for moving */
749 if ((window->moving) && (input->grab.window == window)) return;
750
751 _ecore_wl2_input_mouse_out_send(input, window); 748 _ecore_wl2_input_mouse_out_send(input, window);
752} 749}
753 750
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,
4171} 4171}
4172 4172
4173static void 4173static void
4174_elm_win_frame_cb_move_stop(void *data,
4175 Evas_Object *obj EINA_UNUSED,
4176 const char *sig EINA_UNUSED,
4177 const char *source EINA_UNUSED)
4178{
4179 ELM_WIN_DATA_GET_OR_RETURN(data, sd);
4180
4181#ifdef HAVE_ELEMENTARY_WL2
4182 _elm_win_wl_cursor_set(sd->obj, NULL);
4183#endif
4184}
4185
4186static void
4187_elm_win_frame_cb_resize_start(void *data, Evas_Object *obj EINA_UNUSED, 4174_elm_win_frame_cb_resize_start(void *data, Evas_Object *obj EINA_UNUSED,
4188 const char *sig EINA_UNUSED, const char *source) 4175 const char *sig EINA_UNUSED, const char *source)
4189{ 4176{
@@ -4424,9 +4411,6 @@ _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *element, const char *style)
4424 (sd->frame_obj, "elm,action,move,start", "elm", 4411 (sd->frame_obj, "elm,action,move,start", "elm",
4425 _elm_win_frame_cb_move_start, obj); 4412 _elm_win_frame_cb_move_start, obj);
4426 edje_object_signal_callback_add 4413 edje_object_signal_callback_add
4427 (sd->frame_obj, "elm,action,move,stop", "elm",
4428 _elm_win_frame_cb_move_stop, obj);
4429 edje_object_signal_callback_add
4430 (sd->frame_obj, "elm,action,resize,show", "*", 4414 (sd->frame_obj, "elm,action,resize,show", "*",
4431 _elm_win_frame_cb_resize_show, obj); 4415 _elm_win_frame_cb_resize_show, obj);
4432 edje_object_signal_callback_add 4416 edje_object_signal_callback_add
@@ -4454,9 +4438,6 @@ _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *element, const char *style)
4454 (sd->frame_obj, "efl,action,move,start", "efl", 4438 (sd->frame_obj, "efl,action,move,start", "efl",
4455 _elm_win_frame_cb_move_start, obj); 4439 _elm_win_frame_cb_move_start, obj);
4456 edje_object_signal_callback_add 4440 edje_object_signal_callback_add
4457 (sd->frame_obj, "efl,action,move,stop", "efl",
4458 _elm_win_frame_cb_move_stop, obj);
4459 edje_object_signal_callback_add
4460 (sd->frame_obj, "efl,action,resize,show", "*", 4441 (sd->frame_obj, "efl,action,resize,show", "*",
4461 _elm_win_frame_cb_resize_show, obj); 4442 _elm_win_frame_cb_resize_show, obj);
4462 edje_object_signal_callback_add 4443 edje_object_signal_callback_add