forked from enlightenment/enlightenment
simplify focus on commit block for wl clients
none of this applies to popups
This commit is contained in:
parent
001085f349
commit
42d707909e
|
@ -1347,13 +1347,13 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state)
|
||||||
if (state->new_attach)
|
if (state->new_attach)
|
||||||
{
|
{
|
||||||
_e_comp_wl_surface_state_attach(ec, state);
|
_e_comp_wl_surface_state_attach(ec, state);
|
||||||
if (first && (!ec->comp_data->cursor))
|
if (first && (!ec->comp_data->cursor) && (!e_client_util_is_popup(ec)))
|
||||||
{
|
{
|
||||||
if (!e_client_has_xwindow(ec))
|
if (!e_client_has_xwindow(ec))
|
||||||
{
|
{
|
||||||
ec->take_focus = !e_client_util_is_popup(ec) && (!starting || ec->internal_elm_win);
|
ec->take_focus = !starting || ec->internal_elm_win;
|
||||||
ec->want_focus = ec->override && !e_client_util_is_popup(ec) && !ec->parent;
|
ec->want_focus = ec->override && !ec->parent;
|
||||||
if (ec->parent && (!ec->lock_user_location) && (!e_client_util_is_popup(ec)))
|
if (ec->parent && (!ec->lock_user_location))
|
||||||
e_comp_object_util_center_on(ec->frame, ec->parent->frame);
|
e_comp_object_util_center_on(ec->frame, ec->parent->frame);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue