less negatives means less confusing.. but yeah. get rid of omnipresent check in focus_fallback
This commit is contained in:
parent
cca8a90301
commit
ad8e8d4988
2 changed files with 5 additions and 15 deletions
|
@ -110,17 +110,6 @@ static ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old)
|
|||
return c;
|
||||
}
|
||||
|
||||
ob_debug_type(OB_DEBUG_FOCUS, "trying omnipresentness\n");
|
||||
if (allow_refocus && old &&
|
||||
old->desktop == DESKTOP_ALL &&
|
||||
client_normal(old) &&
|
||||
client_focus(old))
|
||||
{
|
||||
ob_debug_type(OB_DEBUG_FOCUS, "found in omnipresentness\n");
|
||||
return old;
|
||||
}
|
||||
|
||||
|
||||
ob_debug_type(OB_DEBUG_FOCUS, "trying the focus order\n");
|
||||
for (it = focus_order; it; it = g_list_next(it)) {
|
||||
c = it->data;
|
||||
|
|
|
@ -530,16 +530,17 @@ void screen_set_desktop(guint num, gboolean dofocus)
|
|||
}
|
||||
}
|
||||
|
||||
if (focus_client && (focus_client->desktop == DESKTOP_ALL ||
|
||||
focus_client->desktop == screen_desktop))
|
||||
dofocus = FALSE;
|
||||
|
||||
/* have to try focus here because when you leave an empty desktop
|
||||
there is no focus out to watch for
|
||||
|
||||
do this before hiding the windows so if helper windows are coming
|
||||
with us, they don't get hidden
|
||||
*/
|
||||
if (dofocus
|
||||
&& (!focus_client || (focus_client->desktop != DESKTOP_ALL
|
||||
&& focus_client->desktop != num))
|
||||
&& (c = focus_fallback(TRUE)))
|
||||
if (dofocus && (c = focus_fallback(TRUE)))
|
||||
{
|
||||
/* only do the flicker reducing stuff ahead of time if we are going
|
||||
to call xsetinputfocus on the window ourselves. otherwise there is
|
||||
|
|
Loading…
Reference in a new issue