Changeset 3189

Timestamp:

Sep 26, 2007, 5:42:45 PM (15 years ago)

Author:

livings124

Message:

remove the remaining extra drawing and use of non-integers in the regular bar

File:

• trunk/macosx/TorrentCell.m (modified) (4 diffs)

trunk/macosx/TorrentCell.m

@@ -284 +284 @@
     
     int leftWidth = barRect.size.width;
-    float progress = [torrent progress], left = [torrent progressLeft];
+    float progress = [torrent progress];
     
     if (progress < 1.0)
@@ -291 +291 @@
         leftWidth -= rightWidth;
         
-        float rightProgress = 1.0 - progress;
-        if (left < rightProgress)
-        {
-            int rightNoIncludeWidth = rightWidth * ((rightProgress - left) / rightProgress);
+        float rightProgress = 1.0 - progress, progressLeft = [torrent progressLeft];
+        if (progressLeft < rightProgress)
+        {
+            int rightNoIncludeWidth = rightWidth * ((rightProgress - progressLeft) / rightProgress);
             rightWidth -= rightNoIncludeWidth;
             
@@ -334 +334 @@
             {
                 #warning integer-ize!
-                NSRect ratioRect = completeRect;
-                ratioRect.size.width *= [torrent progressStopRatio];
+                /*NSRect ratioRect = completeRect;
+                ratioRect.size.width *= [torrent progressStopRatio];*/
                 
-                if (ratioRect.size.width < completeRect.size.width)
+                int ratioLeftWidth = leftWidth * (1.0 - [torrent progressStopRatio]);
+                leftWidth -= ratioLeftWidth;
+                
+                if (ratioLeftWidth > 0)
                 {
+                    NSRect ratioLeftRect = barRect;
+                    ratioLeftRect.origin.x += leftWidth;
+                    ratioLeftRect.size.width = ratioLeftWidth;
+                    
                     if (!fLightGreenGradient)
                         fLightGreenGradient = [[CTGradient progressLightGreenGradient] retain];
-                    [fLightGreenGradient fillRect: completeRect angle: -90];
+                    [fLightGreenGradient fillRect: ratioLeftRect angle: -90];
                 }
                 
-                if (!fGreenGradient)
-                    fGreenGradient = [[CTGradient progressGreenGradient] retain];
-                [fGreenGradient fillRect: ratioRect angle: -90]; 
+                if (leftWidth > 0)
+                {
+                    completeRect.size.width = leftWidth;
+                    
+                    if (!fGreenGradient)
+                        fGreenGradient = [[CTGradient progressGreenGradient] retain];
+                    [fGreenGradient fillRect: completeRect angle: -90];
+                }
             }
             else
@@ -359 +371 @@
             if ([torrent waitingToStart])
             {
-                if (left <= 0.0)
+                if ([torrent progressLeft] <= 0.0)
                 {
                     if (!fDarkGreenGradient)