summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2016-11-22 11:22:28 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2016-11-22 11:33:40 -0500
commit7c38e4edb4d000d291f03eb682a692dcab053ffa (patch)
treed983aa1992d2808f37594f9cce1a47ca7c0353ab
parenta95d5ebd405f00ef8a8ca03366cff21df375db4e (diff)
clarify some wl surface checks to require elm wins
these should not apply to role-less surfaces
-rw-r--r--src/bin/e_comp_wl.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 5b9389d4d..304fcb3f8 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -1016,7 +1016,7 @@ _e_comp_wl_client_evas_init(E_Client *ec)
1016 _e_comp_wl_evas_cb_hide, ec); 1016 _e_comp_wl_evas_cb_hide, ec);
1017 1017
1018 /* setup input callbacks */ 1018 /* setup input callbacks */
1019 if (ec->internal) 1019 if (ec->internal_elm_win)
1020 { 1020 {
1021 evas_object_smart_callback_add(ec->frame, "mouse_in", 1021 evas_object_smart_callback_add(ec->frame, "mouse_in",
1022 (Evas_Smart_Cb)_e_comp_wl_cb_internal_mouse_in, ec); 1022 (Evas_Smart_Cb)_e_comp_wl_cb_internal_mouse_in, ec);
@@ -1768,7 +1768,7 @@ _e_comp_wl_surface_destroy(struct wl_resource *resource)
1768 1768
1769 if (!(ec = wl_resource_get_user_data(resource))) return; 1769 if (!(ec = wl_resource_get_user_data(resource))) return;
1770 1770
1771 if (ec->internal) 1771 if (ec->internal_elm_win)
1772 { 1772 {
1773 e_pixmap_alias(ec->pixmap, E_PIXMAP_TYPE_WL, wl_resource_get_id(resource)); 1773 e_pixmap_alias(ec->pixmap, E_PIXMAP_TYPE_WL, wl_resource_get_id(resource));
1774 ec->ignored = 1; 1774 ec->ignored = 1;
@@ -2423,7 +2423,7 @@ _e_comp_wl_client_cb_new(void *data EINA_UNUSED, E_Client *ec)
2423 /* NB: could not find a better place to do this, BUT for internal windows, 2423 /* NB: could not find a better place to do this, BUT for internal windows,
2424 * we need to set delete_request else the close buttons on the frames do 2424 * we need to set delete_request else the close buttons on the frames do
2425 * basically nothing */ 2425 * basically nothing */
2426 if ((ec->internal) || (ec->internal_elm_win)) 2426 if (ec->internal_elm_win)
2427 { 2427 {
2428 ec->icccm.delete_request = EINA_TRUE; 2428 ec->icccm.delete_request = EINA_TRUE;
2429 ec->override = elm_win_override_get(e_win_evas_win_get(ecore_evas_get(ecore_event_window_match(win)))); 2429 ec->override = elm_win_override_get(e_win_evas_win_get(ecore_evas_get(ecore_event_window_match(win))));