forked from enlightenment/enlightenment
Remove duplicate code
We always hide border before border del, so we shouldn't be focused here SVN revision: 54272
This commit is contained in:
parent
c12fafe377
commit
b4f9160c09
|
@ -3974,35 +3974,6 @@ _e_border_del(E_Border *bd)
|
||||||
E_Border *child;
|
E_Border *child;
|
||||||
|
|
||||||
if (bd->fullscreen) bd->desk->fullscreen_borders--;
|
if (bd->fullscreen) bd->desk->fullscreen_borders--;
|
||||||
if (bd->focused)
|
|
||||||
{
|
|
||||||
if ((bd->parent) && (bd->parent->modal == bd))
|
|
||||||
e_border_focus_set(bd->parent, 1, 1);
|
|
||||||
else if (e_config->focus_revert_on_hide_or_close)
|
|
||||||
{
|
|
||||||
E_Border *pbd;
|
|
||||||
E_Container *con;
|
|
||||||
E_Zone *zone;
|
|
||||||
E_Desk *desk;
|
|
||||||
|
|
||||||
con = e_container_current_get(e_manager_current_get());
|
|
||||||
zone = e_zone_current_get(con);
|
|
||||||
desk = e_desk_current_get(zone);
|
|
||||||
|
|
||||||
/* When using pointer focus, the border under the
|
|
||||||
* pointer (if any) gets focused, in sloppy/click
|
|
||||||
* focus the last focused window on the current
|
|
||||||
* desk gets focus */
|
|
||||||
if (e_config->focus_policy == E_FOCUS_MOUSE)
|
|
||||||
{
|
|
||||||
pbd = e_border_under_pointer_get(desk, bd);
|
|
||||||
if (pbd)
|
|
||||||
e_border_focus_set(pbd, 1, 1);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
e_desk_last_focused_focus(desk);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((drag_border) && (drag_border->data == bd))
|
if ((drag_border) && (drag_border->data == bd))
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue