[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/libs/taskmanager
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2008-12-01 0:22:01
Message-ID: 1228090921.354767.3996.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 891026 by aseigo:

when the groupIfFull state changes, immediately check to see if we are full. not 100% \
sure if this is what is being triggered by the reporters of bug 176398, but let's \
find out ;)


 M  +9 -7      groupmanager.cpp  


--- trunk/KDE/kdebase/workspace/libs/taskmanager/groupmanager.cpp #891025:891026
@@ -464,11 +464,16 @@
 void GroupManager::setOnlyGroupWhenFull(bool state)
 {
     //kDebug() << state;
+    if (d->onlyGroupWhenFull == state) {
+        return;
+    }
+
     d->onlyGroupWhenFull = state;
 
     if (state) {
         connect(d->rootGroup, SIGNAL(itemAdded(AbstractItemPtr)), this, \
                SLOT(checkIfFull()));
         connect(d->rootGroup, SIGNAL(itemRemoved(AbstractItemPtr)), this, \
SLOT(checkIfFull())); +        d->checkIfFull();
     } else {
         disconnect(d->rootGroup, SIGNAL(itemAdded(AbstractItemPtr)), this, \
                SLOT(checkIfFull()));
         disconnect(d->rootGroup, SIGNAL(itemRemoved(AbstractItemPtr)), this, \
SLOT(checkIfFull())); @@ -479,21 +484,18 @@
 {
     //kDebug() << limit;
     d->groupIsFullLimit = limit;
-    if (!onlyGroupWhenFull()) {
-        return;
+    if (d->onlyGroupWhenFull) {
+        d->checkIfFull();
     }
-    d->checkIfFull();
 }
 
 void GroupManagerPrivate::checkIfFull()
 {
     //kDebug();
-    if (!q->onlyGroupWhenFull()) {
+    if (!onlyGroupWhenFull || groupingStrategy != GroupManager::ProgramGrouping) {
         return;
     }
-    if (groupingStrategy != GroupManager::ProgramGrouping) {
-        return;
-    }
+
     if (itemList.size() >= groupIsFullLimit) {
         //kDebug() << "group is full, setting program grouping";
         q->setGroupingStrategy(GroupManager::ProgramGrouping);


[prev in list] [next in list] [prev in thread] [next in thread]