Changeset 5630

Timestamp:

Apr 16, 2008, 12:32:07 PM (14 years ago)

Author:

livings124

Message:

experiment in improving calculation of the availability bar

Location:

trunk/macosx

Files:

• PrefsController.m (modified) (1 diff)
• Torrent.m (modified) (2 diffs)
• TorrentCell.m (modified) (1 diff)

trunk/macosx/PrefsController.m

@@ -667 +667 @@
     }
     
-    //for network view make sure progress indicator hides itself
-    if (view == fNetworkView && [fPortStatusImage image])
+    //for network view make sure progress indicator hides itself (get around a Tiger bug)
+    if (![NSApp isOnLeopardOrBetter] && view == fNetworkView && [fPortStatusImage image])
         [fPortStatusProgress setDisplayedWhenStopped: NO];
 }

trunk/macosx/Torrent.m

@@ -875 +875 @@
 {
     if (![self isSeeding])
-        return -1;
+        return TR_ETA_UNKNOWN;
     
     float uploadRate = [self uploadRate];
@@ -888 +888 @@
 }
 
-#warning when stats change, elliminate the use of size and make use of just the 2 fields
 - (float) notAvailableDesired
 {
-    return (float)(fStat->leftUntilDone - fStat->desiredAvailable) / [self size];
+    return 1.0 - (float)fStat->desiredAvailable / [self sizeLeft];
 }
 

trunk/macosx/TorrentCell.m

@@ -678 +678 @@
                 && [fDefaults boolForKey: @"DisplayProgressBarAvailable"])
             {
-                int notAvailableWidth = MIN(ceil(barRect.size.width * [torrent notAvailableDesired]), rightWidth);
+                int notAvailableWidth = ceil(rightWidth * [torrent notAvailableDesired]);
                 if (notAvailableWidth > 0)
                 {