summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2016-11-30 12:31:04 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2016-11-30 12:34:30 -0500
commitf83045dc62a5bc8039e63f08817db0740d792e4b (patch)
tree3ce87c4d2c9d9218a27bb77d9563e16b6f70ad5d
parenta3a239c1d0184f38c44f7cba1a4f2ca0dbfaa1e5 (diff)
downloadenlightenment-f83045dc62a5bc8039e63f08817db0740d792e4b.tar.gz
move the comp canvas cursor object during wl surface grabs
the struct member is not guaranteed to be the visible object, so get the ee cursor and move that
-rw-r--r--src/bin/e_comp_wl.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 1d0cba7d74..801e83bea9 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -3447,6 +3447,8 @@ E_API Eina_Bool
e_comp_wl_grab_client_mouse_move(const Ecore_Event_Mouse_Move *ev)
{
E_Client *ec;
+ Evas_Object *o;
+
if (e_comp->comp_type != E_PIXMAP_TYPE_WL) return ECORE_CALLBACK_RENEW;
ec = e_client_focused_get();
if (!ec) return ECORE_CALLBACK_RENEW;
@@ -3455,7 +3457,8 @@ e_comp_wl_grab_client_mouse_move(const Ecore_Event_Mouse_Move *ev)
/* reject mouse moves from outside the popup */
if (_check_grab_coords(ec, ev->x, ev->y)) return ECORE_CALLBACK_RENEW;
/* manually move the pointer since we're about to block the event globally */
- evas_object_move(e_comp->pointer->o_ptr, ev->x, ev->y);
+ ecore_evas_cursor_get(e_comp->ee, &o, NULL, NULL, NULL);
+ evas_object_move(o, ev->x, ev->y);
return ECORE_CALLBACK_DONE;
}