summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2016-11-08 12:44:11 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2016-11-18 11:45:24 -0500
commit8155b456feba133846d29eb8c0144217f7c2c8ca (patch)
treedd78fc78f0313d23847a3670b8e2118c9ae335b3
parent9b17e1079d155c155feca964177d66ca017a1e59 (diff)
reset initial internal wl client states when hiding (but not deleting)
ensure that these windows are not able to be shown again until commits occur
-rw-r--r--src/bin/e_comp_wl.c18
1 files changed, 15 insertions, 3 deletions
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 95318d47e..0ed4a0a2f 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -959,7 +959,13 @@ _e_comp_wl_evas_cb_kill_request(void *data, Evas_Object *obj EINA_UNUSED, void *
959 959
960 evas_object_pass_events_set(ec->frame, EINA_TRUE); 960 evas_object_pass_events_set(ec->frame, EINA_TRUE);
961 if (ec->visible) evas_object_hide(ec->frame); 961 if (ec->visible) evas_object_hide(ec->frame);
962 if (!ec->internal) e_object_del(E_OBJECT(ec)); 962 if (ec->internal)
963 {
964 ec->ignored = 1;
965 if (!e_object_is_del(E_OBJECT(ec)))
966 ec->comp_data->mapped = EINA_FALSE;
967 }
968 else e_object_del(E_OBJECT(ec));
963 969
964 _e_comp_wl_focus_check(); 970 _e_comp_wl_focus_check();
965} 971}
@@ -1759,8 +1765,14 @@ _e_comp_wl_surface_destroy(struct wl_resource *resource)
1759 1765
1760 if (!(ec = wl_resource_get_user_data(resource))) return; 1766 if (!(ec = wl_resource_get_user_data(resource))) return;
1761 1767
1762 e_pixmap_alias(ec->pixmap, E_PIXMAP_TYPE_WL, wl_resource_get_id(resource)); 1768 if (ec->internal)
1763 if (!ec->internal) e_object_del(E_OBJECT(ec)); 1769 {
1770 e_pixmap_alias(ec->pixmap, E_PIXMAP_TYPE_WL, wl_resource_get_id(resource));
1771 ec->ignored = 1;
1772 if (!e_object_is_del(E_OBJECT(ec)))
1773 ec->comp_data->mapped = EINA_FALSE;
1774 }
1775 else e_object_del(E_OBJECT(ec));
1764 evas_object_hide(ec->frame); 1776 evas_object_hide(ec->frame);
1765} 1777}
1766 1778