summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Michael <cpmichael@osg.samsung.com>2016-01-19 10:46:03 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2016-02-02 13:33:50 -0500
commitd37bcc887dc88e4a90d83bd8a7e72cae12ea7908 (patch)
treeb3087b7ea3807a5902642c89cc6f4bb625dbf3f0
parenta928205be41e8b519c104413ada95f5743ec1c2e (diff)
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 <cpmichael@osg.samsung.com>
-rw-r--r--src/bin/e_win.c4
1 files changed, 3 insertions, 1 deletions
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)
79#ifdef HAVE_WAYLAND 79#ifdef HAVE_WAYLAND
80 if (!strncmp(ecore_evas_engine_name_get(ee), "wayland", 7)) 80 if (!strncmp(ecore_evas_engine_name_get(ee), "wayland", 7))
81 { 81 {
82 Ecore_Wl2_Window *ewin = elm_win_wl_window_get(o);
83
82 type = E_PIXMAP_TYPE_WL; 84 type = E_PIXMAP_TYPE_WL;
83 ecore_evas_object_cursor_set(ee, NULL, 0, 0, 0); 85 ecore_evas_object_cursor_set(ee, NULL, 0, 0, 0);
84 ctx->pointer = e_comp->pointer; 86 ctx->pointer = e_comp->pointer;
85 elm_win_borderless_set(o, 1); 87 elm_win_borderless_set(o, 1);
86 wl_win_id = win; 88 wl_win_id = ecore_wl2_window_surface_id_get(ewin);
87 } 89 }
88 else 90 else
89#endif 91#endif