Changeset 6310

Timestamp:

06/15/08 00:33:52 (3 months ago)

Author:

flynd

Message:

Make group expanded/collapsed state stay when resorting list. Also added workaround as sometimes groups would not expand after resorting was performed.

Files:

• trunk/qt4-gui/src/views/userview.cpp (modified) (2 diffs)

trunk/qt4-gui/src/views/userview.cpp

@@ -197 +197 @@
       {
         if (event->pos().x() <= 18) // we clicked an icon area
-          setExpanded(clickedItem, !isExpanded(clickedItem));
+        {
+          bool wasExpanded = isExpanded(clickedItem);
+          setExpanded(clickedItem, !wasExpanded);
+
+          // setExpand may fail, for example after changing sorting an
+          // expanded group can be collapsed but sometimes cannot be expanded
+          // again. This was seen with Qt 4.4.0.
+          if (isExpanded(clickedItem) == wasExpanded)
+          {
+            // Setting expanded state to same state as view currently (falsely)
+            // reports seems to fix it, then set it again to the state we
+            // actually wanted, this times it works.
+            setExpanded(clickedItem, wasExpanded);
+            setExpanded(clickedItem, !wasExpanded);
+          }
+        }
       }
     }
@@ -301 +316 @@
     header()->setSortIndicator(column, order);
   }
+
+  // Group expansion gets confused when sorting is changed so refresh it
+  expandGroups();
 }