summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2016-12-02 09:50:48 -0500
committerChris Michael <cp.michael@samsung.com>2016-12-02 09:50:48 -0500
commit3a68e9554ab9fe4591ce78903dbad10e0aa1fb4c (patch)
tree02cf7016de1dc8a04c2c09416c8f4bf501815bd1
parenta817d2f632342ef647ea466d445f466715a1aec0 (diff)
downloadefl-3a68e9554ab9fe4591ce78903dbad10e0aa1fb4c.tar.gz
elementary: Re-enable wayland_egl mouse pointers
It appears that the 'black square' issue when using wayland_egl canvas for mouse pointers is gone now, so re-enable the usage of gl pointers for elementary windows. Signed-off-by: Chris Michael <cp.michael@samsung.com>
-rw-r--r--src/lib/elementary/efl_ui_win.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 3b1129a523..316c7c5e4c 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -5022,15 +5022,10 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Elm_W
Evas *pevas;
Evas_Coord mw = 1, mh = 1, hx = 0, hy = 0;
- /* FIXME: NB:
- * Disable using wayland_egl engine for mouse pointer right now.
- * This is being disabled due to an issue in the engine where
- * a black square is being drawn behind the pointer image */
-
- /* if (!strcmp(engine, ELM_WAYLAND_SHM)) */
- sd->pointer.ee = ecore_evas_wayland_shm_new(NULL, 0, 0, 0, 1, 1, 0);
- /* else if (!strcmp(engine, ELM_WAYLAND_EGL)) */
- /* sd->pointer.ee = ecore_evas_wayland_egl_new(NULL, 0, 0, 0, 1, 1, 0); */
+ if (!strcmp(engine, ELM_WAYLAND_SHM))
+ sd->pointer.ee = ecore_evas_wayland_shm_new(NULL, 0, 0, 0, 1, 1, 0);
+ else if (!strcmp(engine, ELM_WAYLAND_EGL))
+ sd->pointer.ee = ecore_evas_wayland_egl_new(NULL, 0, 0, 0, 1, 1, 0);
pevas = ecore_evas_get(sd->pointer.ee);