styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

e: move check for border on desk 

We only want to check if the border is on desk to handle
allow_above_fullscreen so move check here. Other code should always be
executed.

SVN revision: 77347
This commit is contained in:
Sebastian Dransfeld 2012-10-03 08:03:17 +00:00
parent 7cc4d1e501
commit 32dc338e1a
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/bin/e_border.c
View File

@ -2262,15 +2262,7 @@ e_border_focus_set(E_Border *bd,
focus_next = eina_list_remove(focus_next, bd);
if (bd == focusing) focusing = NULL;
if ((bd->focused) &&
(
(bd->desk == e_desk_current_get(bd->zone)) ||
(
(bd->desk != e_desk_current_get(bd->zone)) &&
(bd->zone == e_util_zone_current_get(e_manager_current_get()))
) ||
(bd->sticky)
))
if (bd->focused)
{
Eina_Bool wasfocused = EINA_FALSE;
bd_unfocus = bd;
@ -2287,7 +2279,9 @@ e_border_focus_set(E_Border *bd,
e_grabinput_focus(bd->zone->container->bg_win,
E_FOCUS_METHOD_PASSIVE);
}
if ((!e_config->allow_above_fullscreen) && (bd->fullscreen) && (wasfocused))
if ((!e_config->allow_above_fullscreen) &&
(bd->fullscreen) && (wasfocused) &&
((bd->desk == e_desk_current_get(bd->zone)) || (bd->sticky)))
{
Eina_Bool have_vis_child = EINA_FALSE;
Eina_List *l;