experiment in improving calculation of the availability bar

diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m
index cb1ddcb99ab1b38acd9343203d8a607b0e8656f3..c1b32915490b69e914a0bc2acfe4466307f6999b 100644 (file)
--- a/macosx/PrefsController.m
+++ b/macosx/PrefsController.m
@@ -666,8 +666,8 @@
             }
     }
     
-    //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];
 }
 

diff --git a/macosx/Torrent.m b/macosx/Torrent.m
index 920bc76f419b5f0d2c164e223a65304cafbbca3c..423b4bb9c1740094400434761c2aaebb0797bad7 100644 (file)
--- a/macosx/Torrent.m
+++ b/macosx/Torrent.m
@@ -874,7 +874,7 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
 - (int) etaRatio
 {
     if (![self isSeeding])
-        return -1;
+        return TR_ETA_UNKNOWN;
     
     float uploadRate = [self uploadRate];
     if (uploadRate < 0.1)
@@ -887,10 +887,9 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
     return (float)MAX([self downloadedTotal], [self haveTotal]) * (stopRatio - ratio) / uploadRate / 1024.0;
 }
 
-#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];
 }
 
 - (BOOL) isActive

diff --git a/macosx/TorrentCell.m b/macosx/TorrentCell.m
index c80358cee6b6935ef274e4d97d8a7358ed7571d6..53bb592899b3ab9391f804296cd49eefe739aab2 100644 (file)
--- a/macosx/TorrentCell.m
+++ b/macosx/TorrentCell.m
@@ -677,7 +677,7 @@
             if ([torrent isActive] && ![torrent allDownloaded] && ![torrent isChecking]
                 && [fDefaults boolForKey: @"DisplayProgressBarAvailable"])
             {
-                int notAvailableWidth = MIN(ceil(barRect.size.width * [torrent notAvailableDesired]), rightWidth);
+                int notAvailableWidth = ceil(rightWidth * [torrent notAvailableDesired]);
                 if (notAvailableWidth > 0)
                 {
                     rightWidth -= notAvailableWidth;