fix: selected torrents when moving rows (transmission#5991)

* Fix selected torrents when moving rows * code review: keep selected torrents when toggling group presentation
GaryElshaw · Sep 11, 2023 · 92c8c41 · 92c8c41
1 parent d566695
commit 92c8c41
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/macosx/Controller.mm b/macosx/Controller.mm
@@ -3237,6 +3237,9 @@ - (void)applyFilter
         //set all groups as expanded
         [self.fTableView removeAllCollapsedGroups];
 
+        // we need to remember selected values
+        NSArray<Torrent*>* selectedTorrents = self.fTableView.selectedTorrents;
+
         beganUpdates = YES;
         [self.fTableView beginUpdates];
 
@@ -3280,6 +3283,8 @@ - (void)applyFilter
             for (TorrentGroup* group in self.fDisplayedTorrents)
                 [self.fTableView expandItem:group];
         }
+
+        self.fTableView.selectedTorrents = selectedTorrents;
     }
 
     //sort the torrents (won't sort the groups, though)

diff --git a/macosx/TorrentTableView.h b/macosx/TorrentTableView.h
@@ -17,9 +17,7 @@ extern const CGFloat kGroupSeparatorHeight;
 - (void)removeAllCollapsedGroups;
 - (void)saveCollapsedGroups;
 
-- (void)restoreSelectionIndexes;
-
-@property(nonatomic, readonly) NSArray<Torrent*>* selectedTorrents;
+@property(nonatomic) NSArray<Torrent*>* selectedTorrents;
 
 - (NSRect)iconRectForRow:(NSInteger)row;
 

diff --git a/macosx/TorrentTableView.mm b/macosx/TorrentTableView.mm
@@ -125,8 +125,9 @@ - (void)awakeFromNib
 //make sure we don't lose selection on manual reloads
 - (void)reloadData
 {
+    NSArray<Torrent*>* selectedTorrents = self.selectedTorrents;
     [super reloadData];
-    [self restoreSelectionIndexes];
+    self.selectedTorrents = selectedTorrents;
 }
 
 - (void)reloadVisibleRows
@@ -185,8 +186,6 @@ - (void)reloadDataForRowIndexes:(NSIndexSet*)rowIndexes columnIndexes:(NSIndexSe
             }
         }
     }];
-
-    [self restoreSelectionIndexes];
 }
 
 - (BOOL)isGroupCollapsed:(NSInteger)value
@@ -559,6 +558,16 @@ - (void)mouseDown:(NSEvent*)event
     return torrents;
 }
 
+- (void)setSelectedTorrents:(NSArray<Torrent*>*)selectedTorrents
+{
+    NSMutableIndexSet* selectedIndexes = [NSMutableIndexSet new];
+    for (Torrent* i in selectedTorrents)
+    {
+        [selectedIndexes addIndex:[self rowForItem:i]];
+    }
+    [self selectRowIndexes:selectedIndexes byExtendingSelection:NO];
+}
+
 - (NSMenu*)menuForEvent:(NSEvent*)event
 {
     NSInteger row = [self rowAtPoint:[self convertPoint:event.locationInWindow fromView:nil]];
@@ -577,11 +586,6 @@ - (NSMenu*)menuForEvent:(NSEvent*)event
     }
 }
 
-- (void)restoreSelectionIndexes
-{
-    [self selectRowIndexes:self.fSelectedRowIndexes byExtendingSelection:NO];
-}
-
 //make sure that the pause buttons become orange when holding down the option key
 - (void)flagsChanged:(NSEvent*)event
 {