From 62171ab39a83e015b9f0799fd45934a60e0edb54 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <zmike@osg.samsung.com>
Date: Tue, 19 Jan 2016 13:51:05 -0500
Subject: [PATCH] improve focus setting during wayland client show callback

take_focus will only be handled if the new_client flag is set. in all
other casees, focus_set should be called directly

new_client flag implies changed flag
---
 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 35394c5ae..0d8eacf01 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -125,8 +125,10 @@ _e_comp_wl_evas_cb_show(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EIN
 
    if (!ec->ignored)
      {
-        ec->take_focus = !starting;
-        EC_CHANGED(ec);
+        if (ec->new_client)
+          ec->take_focus = !starting;
+        else
+          evas_object_focus_set(ec->frame, !starting);
      }
 
    EINA_LIST_FOREACH(ec->e.state.video_child, l, tmp)