Changeset 7077

Timestamp:

Nov 8, 2008, 10:13:00 PM (12 years ago)

Author:

livings124

Message:

trivial changes to table grid color drawing and other areas

Location:

trunk/macosx

Files:

• BadgeView.m (modified) (1 diff)
• Badger.m (modified) (1 diff)
• Controller.m (modified) (2 diffs)
• TorrentTableView.m (modified) (1 diff)
• TrackerTableView.m (modified) (1 diff)

trunk/macosx/BadgeView.m

@@ -58 +58 @@
 {
     //only needs update if the badges were displayed or are displayed now
-    BOOL needsUpdate = fDownloadRate != downloadRate || fUploadRate != uploadRate;
-    if (needsUpdate)
-    {
-        fDownloadRate = downloadRate;
-        fUploadRate = uploadRate;
-    }
+    if (fDownloadRate == downloadRate && fUploadRate == uploadRate)
+        return NO;
     
-    return needsUpdate;
+    fDownloadRate = downloadRate;
+    fUploadRate = uploadRate;
+    return YES;
 }
 

trunk/macosx/Badger.m

@@ -97 +97 @@
         return;
     }
-    else if (fQuittingTiger)
+    
+    if (fQuittingTiger)
         return;
-    else;
     
     //set completed badge to top right

trunk/macosx/Controller.m

@@ -4230 +4230 @@
         while ((torrent = [enumerator nextObject]))
             if (torrentStruct == [torrent torrentStruct])
+            {
+                [torrent retain];
                 break;
+            }
         
         if (!torrent)
@@ -4239 +4242 @@
             return;
         }
-        
-        [torrent retain];
     }
     

trunk/macosx/TorrentTableView.m

@@ -739 +739 @@
         visibleRect.origin.y = newY;
     }
-    
+        
     //remaining visible rows continue alternating
-    CGFloat height = [self rowHeight] + [self intercellSpacing].height;
-    NSInteger numberOfRects = ceil(visibleRect.size.height / height);
+    const CGFloat height = [self rowHeight] + [self intercellSpacing].height;
+    const NSInteger numberOfRects = ceil(visibleRect.size.height / height);
+    
     visibleRect.size.height = height;
-    
-    for (NSInteger i=0; i<numberOfRects; i++)
-    {
-        if (!start)
-            NSRectFill(visibleRect);
-        
-        start = !start;
+    if (start)
         visibleRect.origin.y += height;
+    
+    for (NSInteger i = start ? 1 : 0; i<numberOfRects; i += 2)
+    {
+        NSRectFill(visibleRect);
+        visibleRect.origin.y += 2 * height;
     }
     

trunk/macosx/TrackerTableView.m

@@ -87 +87 @@
     
     //remaining visible rows continue alternating
-    CGFloat height = [self rowHeight] + [self intercellSpacing].height;
-    NSInteger numberOfRects = ceil(visibleRect.size.height / height);
+    const CGFloat height = [self rowHeight] + [self intercellSpacing].height;
+    const NSInteger numberOfRects = ceil(visibleRect.size.height / height);
+    
     visibleRect.size.height = height;
+    if (start)
+        visibleRect.origin.y += height;
     
-    for (NSInteger i=0; i<numberOfRects; i++)
+    for (NSInteger i = start ? 1 : 0; i<numberOfRects; i += 2)
     {
-        if (!start)
-            NSRectFill(visibleRect);
-        
-        start = !start;
-        visibleRect.origin.y += height;
+        NSRectFill(visibleRect);
+        visibleRect.origin.y += 2 * height;
     }