From: Dana Jansens Date: Sun, 22 Apr 2007 04:42:33 +0000 (+0000) Subject: don't fallback to the desktop again when leaving show-desktop-mode X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=63f1b1230c529c2c2b335a4becfae5cd15c0d9a4;p=chaz%2Fopenbox don't fallback to the desktop again when leaving show-desktop-mode --- diff --git a/openbox/screen.c b/openbox/screen.c index 5f0ef0e7..d5d61f50 100644 --- a/openbox/screen.c +++ b/openbox/screen.c @@ -887,7 +887,21 @@ void screen_show_desktop(gboolean show) break; } } else { - focus_fallback(TRUE); + /* use NULL for the "old" argument because the desktop was focused + and we don't want to fallback to the desktop by default */ + focus_hilite = focus_fallback_target(TRUE, NULL); + if (focus_hilite) { + frame_adjust_focus(focus_hilite->frame, TRUE); + + /*! + When this focus_client check is not used, you can end up with + races, as demonstrated with gnome-panel, sometimes the window + you click on another desktop ends up losing focus cuz of the + focus change here. + */ + /*if (!focus_client)*/ + client_focus(focus_hilite); + } } show = !!show; /* make it boolean */