aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2017-01-30 12:59:29 -0500
committerChris Michael <cp.michael@samsung.com>2017-01-30 12:59:29 -0500
commit4697d0c2b3c27cfb31d88918ac3f5d615ff9d541 (patch)
tree5a6cbc9973ca91572088545b764ec5aa4b41ea56
parentelementary: Don't hide pointer window on mouse out (diff)
downloadefl-4697d0c2b3c27cfb31d88918ac3f5d615ff9d541.tar.gz
elementary: Ensure pointer hotspot update and reduce duplicated code
When we mouse_in on a window, the cursor hotspot may need updating for the new pointer image, so utilize an existing function we already have which will set the pointer image and calculate updated hotspot. This patch also uses the same function call in _elm_win_frame_cb_move_stop in order to reduce duplication. ref https://phab.enlightenment.org/T4987 @fix Signed-off-by: Chris Michael <cp.michael@samsung.com>
-rw-r--r--src/lib/elementary/efl_ui_win.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 1d06584e9a..a9db0f480b 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -952,14 +952,11 @@ _elm_win_mouse_in(Ecore_Evas *ee)
#ifdef HAVE_ELEMENTARY_WL2
if ((sd->wl.win) && (sd->pointer.ee))
{
- _elm_theme_object_set(sd->obj, sd->pointer.obj,
- "pointer", "base", "default");
-
sd->pointer.visible = EINA_TRUE;
ecore_evas_show(sd->pointer.ee);
sd->pointer.surf = ecore_wl2_window_surface_get(sd->pointer.win);
- ecore_wl2_window_pointer_set(sd->wl.win, sd->pointer.surf,
- sd->pointer.hot_x, sd->pointer.hot_y);
+
+ _elm_win_wl_cursor_set(sd->obj, NULL);
}
#endif
}
@@ -3947,13 +3944,7 @@ _elm_win_frame_cb_move_stop(void *data,
ELM_WIN_DATA_GET_OR_RETURN(data, sd);
#ifdef HAVE_ELEMENTARY_WL2
- if (sd->pointer.obj)
- _elm_theme_object_set(sd->obj, sd->pointer.obj,
- "pointer", "base", "default");
-
- if ((sd->wl.win) && (sd->pointer.surf) && (sd->pointer.visible))
- ecore_wl2_window_pointer_set(sd->wl.win, sd->pointer.surf,
- sd->pointer.hot_x, sd->pointer.hot_y);
+ _elm_win_wl_cursor_set(sd->obj, NULL);
#endif
}