allow focus to revert to stuck windows, and we'll see if it still causes

problems with normal focus -- that comment is older than FocusControl.cc, and
I've made a lot of changes to focus handling since then; just disabling it
wasn't the right thing to do, anyway

2 files changed, 5 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 8db797a..6218194 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
  (Format: Year/Month/Day)
 Changes for 1.0rc3:
+*06/12/28:
+   * Allow focus to revert to stuck windows (Mark)
+     FocusControl.cc
 *06/12/27:
    * Don't assume "Jump" and "*Hidden" say "yes" in apps file (Mark)
    * Jump to autogrouped windows on another workspace if set to do so in
diff --git a/src/FocusControl.cc b/src/FocusControl.cc
index 014a9df..d3e6838 100644
--- a/src/FocusControl.cc
+++ b/src/FocusControl.cc
@@ -190,11 +190,8 @@ WinClient *FocusControl::lastFocusedWindow(int workspace) {
     FocusedWindows::iterator it_end = m_focused_list.end();
     for (; it != it_end; ++it) {
         if ((*it)->fbwindow() &&
-            (((int)(*it)->fbwindow()->workspaceNumber()) == workspace 
-             && !(*it)->fbwindow()->isIconic()
-             && (!(*it)->fbwindow()->isStuck() || (*it)->fbwindow()->isFocused())))
-            // only give focus to a stuck window if it is currently focused
-            // otherwise they tend to override normal workspace focus
+            ((((int)(*it)->fbwindow()->workspaceNumber()) == workspace ||
+             (*it)->fbwindow()->isStuck()) && !(*it)->fbwindow()->isIconic()))
             return *it;
     }
     return 0;