From 1b36f93956ea80173c5fef2fa8fbb0d9a886efb1 Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Tue, 19 Jan 2016 10:46:03 -0500 Subject: [PATCH] Fix issue of using the wrong id when finding pixmap client Previously, we were passing in the wl window id into the pixmap_find_client function. This is improper as the e_pixmap_new functions take the surface resource id. To solve this, we will get the Ecore_Wl2_window from the Evas_Object, fetch the surface id from that, then pass those into e_pixmap_find_client. This resolves an issue where the everything module was not working properly. ref T3058 Signed-off-by: Chris Michael --- src/bin/e_win.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/bin/e_win.c b/src/bin/e_win.c index 266d43f28..51c21a434 100644 --- a/src/bin/e_win.c +++ b/src/bin/e_win.c @@ -79,11 +79,13 @@ _e_elm_win_trap_show(void *data, Evas_Object *o) #ifdef HAVE_WAYLAND if (!strncmp(ecore_evas_engine_name_get(ee), "wayland", 7)) { + Ecore_Wl2_Window *ewin = elm_win_wl_window_get(o); + type = E_PIXMAP_TYPE_WL; ecore_evas_object_cursor_set(ee, NULL, 0, 0, 0); ctx->pointer = e_comp->pointer; elm_win_borderless_set(o, 1); - wl_win_id = win; + wl_win_id = ecore_wl2_window_surface_id_get(ewin); } else #endif