Changeset 13164

Timestamp:

Jan 14, 2012, 8:07:26 PM (11 years ago)

Author:

livings124

Message:

unconditionally expand all groups when toggling group rows

File:

• trunk/macosx/Controller.m (modified) (4 diffs)

trunk/macosx/Controller.m

@@ -1880 +1880 @@
     BOOL sortByGroup = ![fDefaults boolForKey: @"SortByGroup"];
     [fDefaults setBool: sortByGroup forKey: @"SortByGroup"];
-    
-    //expand all groups
-    if (sortByGroup)
-        [fTableView removeAllCollapsedGroups];
     
     [self applyFilter];
@@ -2375 +2371 @@
         NSAssert(groupRows != wasGroupRows, @"Trying toggling group-torrent reordering when we weren't expecting to.");
         
+        //set all groups as expanded
+        [fTableView removeAllCollapsedGroups];
+        
         //since we're not doing this the right way (boo buggy animation), we need to remember selected values
         #warning when Lion-only and using views instead of cells, this likely won't be needed
@@ -2405 +2404 @@
             [fDisplayedTorrents setArray: [groupsByIndex allValues]];
             
+            //actually expand group rows
+            for (TorrentGroup * group in fDisplayedTorrents)
+                [fTableView expandItem: group];
+            
             //we need the groups to be sorted, and we can do it without moving items in the table, too!
             NSSortDescriptor * groupDescriptor = [NSSortDescriptor sortDescriptorWithKey: @"groupOrderValue" ascending: YES];
@@ -2414 +2417 @@
         if (onLion)
             [fTableView insertItemsAtIndexes: [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, [fDisplayedTorrents count])] inParent: nil withAnimation: NSTableViewAnimationEffectFade];
-        
-        //reset expanded/collapsed rows
-        if (groupRows)
-        {
-            for (TorrentGroup * group in fDisplayedTorrents)
-            {
-                if ([fTableView isGroupCollapsed: [group groupIndex]])
-                    [fTableView collapseItem: group];
-                else
-                    [fTableView expandItem: group];
-            }
-        }
         
         if (selectedValues)