From b80f0fce562cf54d3e0e8c88ac2d49ffba32ffb7 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 18 Aug 2017 15:52:52 -0400 Subject: [PATCH] don't set focus attrs in wl surface commit for xwl clients these should be getting set in other places...I think... --- src/bin/e_comp_wl.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index 2312b2ac8..4ce967e54 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -1349,8 +1349,11 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state) _e_comp_wl_surface_state_attach(ec, state); if (first && (!ec->comp_data->cursor)) { - ec->take_focus = !starting || ec->internal_elm_win; - ec->want_focus = ec->override && !e_client_util_is_popup(ec) && !ec->parent; + if (!e_client_has_xwindow(ec)) + { + ec->take_focus = !starting || ec->internal_elm_win; + ec->want_focus = ec->override && !e_client_util_is_popup(ec) && !ec->parent; + } if (ec->parent && (!ec->lock_user_location) && (!e_client_util_is_popup(ec))) e_comp_object_util_center_on(ec->frame, ec->parent->frame); }