From e3efba7ff7485f6a6d7ca4d83c35627b4233f97d Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 10 Feb 2015 19:15:22 -0500 Subject: [PATCH] set take_focus more appropriately for wl clients --- src/bin/e_comp_wl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index ac1467b5a..4e5eaa896 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -122,7 +122,10 @@ _e_comp_wl_evas_cb_show(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EIN { ec->comp_data->need_reparent = EINA_TRUE; ec->visible = EINA_TRUE; - if (ec->internal_elm_win) ec->take_focus = EINA_TRUE; + } + if (!e_client_util_ignored_get(ec)) + { + ec->take_focus = !starting; EC_CHANGED(ec); } @@ -2019,7 +2022,6 @@ _e_comp_wl_client_cb_new(void *data EINA_UNUSED, E_Client *ec) if ((!e_client_util_ignored_get(ec)) && (!ec->internal)) { ec->comp_data->need_reparent = EINA_TRUE; - ec->take_focus = !starting; } /* add this client to the hash */