Changeset 9488

Timestamp:

Nov 7, 2009, 4:08:42 AM (13 years ago)

Author:

livings124

Message:

the red unavailable bar wasn't showing if none of the desired data was available

File:

• trunk/macosx/TorrentCell.m (modified) (1 diff)

trunk/macosx/TorrentCell.m

@@ -630 +630 @@
     }
     
+    if (![torrent allDownloaded])
+    {
+        const CGFloat widthRemaining = floorf(NSWidth(barRect) * [torrent progressLeft]);
+        
+        NSRect wantedRect;
+        NSDivideRect(missingRect, &wantedRect, &missingRect, widthRemaining, NSMinXEdge);
+        
+        //not-available section
+        if ([torrent isActive] && ![torrent isChecking] && [fDefaults boolForKey: @"DisplayProgressBarAvailable"]
+            && [torrent availableDesired] < 1.0)
+        {
+            NSRect unavailableRect;
+            NSDivideRect(wantedRect, &wantedRect, &unavailableRect, floorf(NSWidth(wantedRect) * [torrent availableDesired]),
+                        NSMinXEdge);
+            
+            [[ProgressGradients progressRedGradient] drawInRect: unavailableRect angle: 90];
+        }
+        
+        //remaining section
+        [[ProgressGradients progressWhiteGradient] drawInRect: wantedRect angle: 90];
+    }
+    
+    //unwanted section
     if (!NSIsEmptyRect(missingRect))
-    {
-        if (![torrent allDownloaded])
-        {
-            const CGFloat widthRemaining = floorf(NSWidth(barRect) * [torrent progressLeft]);
-            
-            NSRect wantedRect;
-            NSDivideRect(missingRect, &wantedRect, &missingRect, widthRemaining, NSMinXEdge);
-            
-            //not-available section
-            if ([torrent isActive] && ![torrent isChecking] && [fDefaults boolForKey: @"DisplayProgressBarAvailable"]
-                && [torrent availableDesired] > 0.0)
-            {
-                NSRect unavailableRect;
-                NSDivideRect(wantedRect, &wantedRect, &unavailableRect, floorf([torrent availableDesired] * NSWidth(wantedRect)),
-                            NSMinXEdge);
-                
-                [[ProgressGradients progressRedGradient] drawInRect: unavailableRect angle: 90];
-            }
-            
-            //remaining section
-            [[ProgressGradients progressWhiteGradient] drawInRect: wantedRect angle: 90];
-        }
-        
-        //unwanted section
         [[ProgressGradients progressLightGrayGradient] drawInRect: missingRect angle: 90];
-    }
 }