aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrathnor <rathnor>2004-06-21 09:53:01 (GMT)
committerrathnor <rathnor>2004-06-21 09:53:01 (GMT)
commit6a51cefb2f67c041f19cbb3842adb81ff54b4771 (patch)
tree14665adc9976bc6875477949d9a4370f6540a1c2
parentf4d9fec50a44c65d12420c6114ac3aca198ee678 (diff)
downloadfluxbox_paul-6a51cefb2f67c041f19cbb3842adb81ff54b4771.zip
fluxbox_paul-6a51cefb2f67c041f19cbb3842adb81ff54b4771.tar.bz2
fix groups file problem with windows not showing properly
-rw-r--r--ChangeLog3
-rw-r--r--src/Workspace.cc7
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 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.10: 2Changes for 0.9.10:
3*04/06/21:
4 * Fix autogrouping issue where windows wouldn't show (Simon)
5 Workspace.cc
3*04/06/20: 6*04/06/20:
4 * Clean out old nls stuff. Move in those strings that 7 * Clean out old nls stuff. Move in those strings that
5 are still in the new names, new Makefiles, etc (Simon) 8 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 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Workspace.cc,v 1.97 2004/06/07 11:46:04 rathnor Exp $ 25// $Id: Workspace.cc,v 1.98 2004/06/21 09:53:01 rathnor Exp $
26 26
27#include "Workspace.hh" 27#include "Workspace.hh"
28 28
@@ -281,7 +281,7 @@ bool Workspace::checkGrouping(FluxboxWindow &win) {
281 281
282 string instance_name = win.winClient().getWMClassName(); 282 string instance_name = win.winClient().getWMClassName();
283 283
284 // go throu every group and search for matching win instancename 284 // go through every group and search for matching win instancename
285 GroupList::iterator g(m_groups.begin()); 285 GroupList::iterator g(m_groups.begin());
286 GroupList::iterator g_end(m_groups.end()); 286 GroupList::iterator g_end(m_groups.end());
287 for (; g != g_end; ++g) { 287 for (; g != g_end; ++g) {
@@ -303,7 +303,8 @@ bool Workspace::checkGrouping(FluxboxWindow &win) {
303 (*g).end(), 303 (*g).end(),
304 FindInGroup(*(*wit))) != (*g).end()) { 304 FindInGroup(*(*wit))) != (*g).end()) {
305 // make sure the window is groupable 305 // make sure the window is groupable
306 if ( !(*wit)->isGroupable() && (*wit)->winClient().fbwindow() == &win) 306 // and don't group with ourself
307 if ( !(*wit)->isGroupable() || (*wit)->winClient().fbwindow() == &win)
307 break; // try next name 308 break; // try next name
308#ifdef DEBUG 309#ifdef DEBUG
309 cerr<<__FILE__<<"("<<__FUNCTION__<<"): window ("<<*wit<<") attaching window ("<<&win<<")"<<endl; 310 cerr<<__FILE__<<"("<<__FUNCTION__<<"): window ("<<*wit<<") attaching window ("<<&win<<")"<<endl;