Changeset 4879

Timestamp:

Jan 31, 2008, 4:02:26 AM (15 years ago)

Author:

livings124

Message:

fix up the code to get the selected torrent when a group is selected

File:

• trunk/macosx/TorrentTableView.m (modified) (6 diffs)

trunk/macosx/TorrentTableView.m

@@ -34 +34 @@
 #define ACTION_MENU_LIMIT_TAG 103
 
-#define PIECE_INCREASE 0.1
+#define PIECE_CHANGE 0.1
 #define PIECE_TIME 0.01
 
@@ -314 +314 @@
     for (i = [selectedIndexes firstIndex]; i != NSNotFound; i = [selectedIndexes indexGreaterThanIndex: i])
     {
-        
         if (![fGroupIndexes containsIndex: i])
             [indexSet addIndex: i];
         else
         {
-            NSUInteger nextGroup = [fGroupIndexes indexGreaterThanIndex: i],
-                        count = (nextGroup != NSNotFound ? nextGroup : [fTorrents count]) - i - 1;
-            [indexSet addIndexesInRange: NSMakeRange(i+1, count)];
-            i = nextGroup-1;
+            NSUInteger nextGroup = [fGroupIndexes indexGreaterThanIndex: i];
+            if (nextGroup == NSNotFound)
+                nextGroup = [fTorrents count];
+            
+            [indexSet addIndexesInRange: NSMakeRange(i+1, nextGroup - i - 1)];
+            
+             i = nextGroup - 1;
         }
     }
@@ -331 +333 @@
 {
     int row = [self rowAtPoint: [self convertPoint: [event locationInWindow] fromView: nil]];
-    
     if (row >= 0)
     {
@@ -665 +666 @@
 {
     int row = [self rowAtPoint: point];
-    if (row < 0  || [fGroupIndexes containsIndex: row] || [fDefaults boolForKey: @"SmallView"])
+    if (row < 0 || [fGroupIndexes containsIndex: row] || [fDefaults boolForKey: @"SmallView"])
         return NO;
     
@@ -682 +683 @@
 {
     int row = [self rowAtPoint: point];
-    if (row < 0  || [fGroupIndexes containsIndex: row] || ![fDefaults boolForKey: @"SmallView"])
+    if (row < 0 || [fGroupIndexes containsIndex: row] || ![fDefaults boolForKey: @"SmallView"])
         return NO;
     
@@ -748 +749 @@
     if ([fDefaults boolForKey: @"PiecesBar"])
     {
-        fPiecesBarPercent = MIN(fPiecesBarPercent + PIECE_INCREASE, 1.0);
+        fPiecesBarPercent = MIN(fPiecesBarPercent + PIECE_CHANGE, 1.0);
         done = fPiecesBarPercent == 1.0;
     }
     else
     {
-        fPiecesBarPercent = MAX(fPiecesBarPercent - PIECE_INCREASE, 0.0);
+        fPiecesBarPercent = MAX(fPiecesBarPercent - PIECE_CHANGE, 0.0);
         done = fPiecesBarPercent == 0.0;
     }