wl popup surfaces should not receive focus on show if parent is not focused

fix T3339 harder
This commit is contained in:
Mike Blumenkrantz 2016-04-04 12:51:29 -04:00
parent b9b9ed68b0
commit 3f7e6dc359
1 changed files with 6 additions and 8 deletions

View File

@ -113,14 +113,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