summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2016-11-22 11:20:33 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2016-11-22 11:33:08 -0500
commita95d5ebd405f00ef8a8ca03366cff21df375db4e (patch)
treef1d9e48ca51a13d5070e7aa352382fc5257cdc80
parentb4a3dc1f885d8b21f7059b106db084765387c5b5 (diff)
require an elm win to apply auto-visibility for internal wins in wl surface commit
other internal surfaces could be things like cursors, and these should not be made visible before setting a role
-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 40e44d1d3..5b9389d4d 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -1318,7 +1318,7 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state)
1318#endif 1318#endif
1319 1319
1320 ec->comp_data->in_commit = 1; 1320 ec->comp_data->in_commit = 1;
1321 if (state->new_attach && ec->ignored && (ec->comp_data->shell.surface || ec->internal)) 1321 if (state->new_attach && ec->ignored && (ec->comp_data->shell.surface || ec->internal_elm_win))
1322 { 1322 {
1323 EC_CHANGED(ec); 1323 EC_CHANGED(ec);
1324 ec->new_client = 1; 1324 ec->new_client = 1;
@@ -1393,7 +1393,7 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state)
1393 { 1393 {
1394 if ((ec->comp_data->shell.surface) && (ec->comp_data->shell.unmap)) 1394 if ((ec->comp_data->shell.surface) && (ec->comp_data->shell.unmap))
1395 ec->comp_data->shell.unmap(ec->comp_data->shell.surface); 1395 ec->comp_data->shell.unmap(ec->comp_data->shell.surface);
1396 else if (ec->comp_data->cursor || e_client_has_xwindow(ec) || ec->internal || 1396 else if (ec->comp_data->cursor || e_client_has_xwindow(ec) || ec->internal_elm_win ||
1397 (ec->comp_data->sub.data && ec->comp_data->sub.data->parent->comp_data->mapped) || 1397 (ec->comp_data->sub.data && ec->comp_data->sub.data->parent->comp_data->mapped) ||
1398 (ec == e_comp_wl->drag_client)) 1398 (ec == e_comp_wl->drag_client))
1399 { 1399 {
@@ -1409,7 +1409,7 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state)
1409 { 1409 {
1410 if ((ec->comp_data->shell.surface) && (ec->comp_data->shell.map)) 1410 if ((ec->comp_data->shell.surface) && (ec->comp_data->shell.map))
1411 ec->comp_data->shell.map(ec->comp_data->shell.surface); 1411 ec->comp_data->shell.map(ec->comp_data->shell.surface);
1412 else if (ec->comp_data->cursor || e_client_has_xwindow(ec) || ec->internal || 1412 else if (ec->comp_data->cursor || e_client_has_xwindow(ec) || ec->internal_elm_win ||
1413 (ec->comp_data->sub.data && ec->comp_data->sub.data->parent->comp_data->mapped) || 1413 (ec->comp_data->sub.data && ec->comp_data->sub.data->parent->comp_data->mapped) ||
1414 (ec == e_comp_wl->drag_client)) 1414 (ec == e_comp_wl->drag_client))
1415 { 1415 {