From 6a51cefb2f67c041f19cbb3842adb81ff54b4771 Mon Sep 17 00:00:00 2001 From: rathnor Date: Mon, 21 Jun 2004 09:53:01 +0000 Subject: fix groups file problem with windows not showing properly --- ChangeLog | 3 +++ src/Workspace.cc | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index edf8c7d..5a187a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ (Format: Year/Month/Day) Changes for 0.9.10: +*04/06/21: + * Fix autogrouping issue where windows wouldn't show (Simon) + Workspace.cc *04/06/20: * Clean out old nls stuff. Move in those strings that are still in the new names, new Makefiles, etc (Simon) diff --git a/src/Workspace.cc b/src/Workspace.cc index b9776d7..18a2ba5 100644 --- a/src/Workspace.cc +++ b/src/Workspace.cc @@ -22,7 +22,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: Workspace.cc,v 1.97 2004/06/07 11:46:04 rathnor Exp $ +// $Id: Workspace.cc,v 1.98 2004/06/21 09:53:01 rathnor Exp $ #include "Workspace.hh" @@ -281,7 +281,7 @@ bool Workspace::checkGrouping(FluxboxWindow &win) { string instance_name = win.winClient().getWMClassName(); - // go throu every group and search for matching win instancename + // go through every group and search for matching win instancename GroupList::iterator g(m_groups.begin()); GroupList::iterator g_end(m_groups.end()); for (; g != g_end; ++g) { @@ -303,7 +303,8 @@ bool Workspace::checkGrouping(FluxboxWindow &win) { (*g).end(), FindInGroup(*(*wit))) != (*g).end()) { // make sure the window is groupable - if ( !(*wit)->isGroupable() && (*wit)->winClient().fbwindow() == &win) + // and don't group with ourself + if ( !(*wit)->isGroupable() || (*wit)->winClient().fbwindow() == &win) break; // try next name #ifdef DEBUG cerr<<__FILE__<<"("<<__FUNCTION__<<"): window ("<<*wit<<") attaching window ("<<&win<<")"<