[EGIT] [core/enlightenment] enlightenment-0.20 87/140: wl popup surfaces should not receive focus on show if parent is not focused

[Mike Blumenkrantz]

discomfitor pushed a commit to branch enlightenment-0.20.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=f65a5bb3bbf5d37448d53226958c2fa1ab2695d3

commit f65a5bb3bbf5d37448d53226958c2fa1ab2695d3
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Mon Apr 4 12:51:29 2016 -0400

    wl popup surfaces should not receive focus on show if parent is not focused
    
    fix T3339 harder
---
 src/bin/e_comp_wl.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 8c5a06f..551580d 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -112,14 +112,12 @@ _e_comp_wl_evas_cb_show(void *data, Evas *evas 
EINA_UNUSED, Evas_Object *obj EIN
 
    if (!ec->override) e_hints_window_visible_set(ec);
 
-
-   if ((!ec->ignored) && (!ec->comp_data->cursor))
-     {
-        if (ec->new_client)
-          ec->take_focus = !starting;
-        else
-          evas_object_focus_set(ec->frame, !starting);
-     }
+   if (ec->ignored || ec->comp_data->cursor) return;
+   if (ec->parent && (!ec->parent->focused)) return;
+   if (ec->new_client)
+     ec->take_focus = !starting;
+   else
+     evas_object_focus_set(ec->frame, !starting);
 }
 
 static void

--