Changeset 3386 for trunk/macosx/Badger.m

Timestamp:

Oct 13, 2007, 3:16:51 AM (15 years ago)

Author:

livings124

Message:

various trivial changes to the badger code

File:

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

trunk/macosx/Badger.m

@@ -59 +59 @@
 {
     //set completed badge to top right
-    BOOL baseChange;
-    if (baseChange = (fCompleted != fCompletedBadged))
+    BOOL baseChange = fCompleted != fCompletedBadged;
+    if (baseChange)
     {
         fCompletedBadged = fCompleted;
@@ -100 +100 @@
     }
     
-    //set upload and download rate badges
-    NSString * downloadRateString = nil, * uploadRateString = nil;
+    NSImage * dockIcon = nil;
+    BOOL speedBadge = NO;
     
     BOOL checkDownload = [[NSUserDefaults standardUserDefaults] boolForKey: @"BadgeDownloadRate"],
@@ -107 +107 @@
     if (checkDownload || checkUpload)
     {
+        //set upload and download rate badges
+        NSString * downloadRateString = nil, * uploadRateString = nil;
+        
         float downloadRate, uploadRate;
         tr_torrentRates(fLib, &downloadRate, &uploadRate);
@@ -114 +117 @@
         if (checkUpload && uploadRate >= 0.1)
             uploadRateString = [NSString stringForSpeedAbbrev: uploadRate];
-    }
-    
-    NSImage * dockIcon = nil;
-    BOOL speedBadge = uploadRateString || downloadRateString;
-    if (speedBadge)
-    {
-        if (!fDockIcon)
-            fDockIcon = [[NSImage imageNamed: @"NSApplicationIcon"] copy];
-        dockIcon = [fDockIcon copy];
-        
-        if (!fUploadBadge)
-            fUploadBadge = [NSImage imageNamed: @"UploadBadge"];
-        if (!fDownloadBadge)
-            fDownloadBadge = [NSImage imageNamed: @"DownloadBadge"];
-        
-        NSRect badgeRect;
-        badgeRect.size = [fUploadBadge size];
-        badgeRect.origin = NSZeroPoint;
-        
-        //ignore shadow of badge when placing string
-        NSRect stringRect = badgeRect;
-        float badgeBottomExtra = 2.0;
-        stringRect.size.height -= badgeBottomExtra;
-        stringRect.origin.y += badgeBottomExtra;
-        
-        [dockIcon lockFocus];
-        
-        if (uploadRateString)
+        
+        speedBadge = uploadRateString || downloadRateString;
+        if (speedBadge)
         {
-            //place badge
-            [fUploadBadge compositeToPoint: badgeRect.origin operation: NSCompositeSourceOver];
-            
-            //place badge text
-            [self badgeString: uploadRateString forRect: stringRect];
-        }
-        
-        if (downloadRateString)
-        {
-            //download rate above upload rate
+            if (!fDockIcon)
+                fDockIcon = [[NSImage imageNamed: @"NSApplicationIcon"] copy];
+            dockIcon = [fDockIcon copy];
+            
+            if (!fUploadBadge)
+                fUploadBadge = [NSImage imageNamed: @"UploadBadge"];
+            if (!fDownloadBadge)
+                fDownloadBadge = [NSImage imageNamed: @"DownloadBadge"];
+            
+            NSRect badgeRect;
+            badgeRect.size = [fUploadBadge size];
+            badgeRect.origin = NSZeroPoint;
+            
+            //ignore shadow of badge when placing string
+            NSRect stringRect = badgeRect;
+            float badgeBottomExtra = 2.0;
+            stringRect.size.height -= badgeBottomExtra;
+            stringRect.origin.y += badgeBottomExtra;
+            
+            [dockIcon lockFocus];
+            
             if (uploadRateString)
             {
-                float spaceBetween = badgeRect.size.height + 2.0;
-                badgeRect.origin.y += spaceBetween;
-                stringRect.origin.y += spaceBetween;
+                //place badge and text
+                [fUploadBadge compositeToPoint: badgeRect.origin operation: NSCompositeSourceOver];
+                [self badgeString: uploadRateString forRect: stringRect];
             }
-        
-            //place badge
-            [fDownloadBadge compositeToPoint: badgeRect.origin operation: NSCompositeSourceOver];
-            
-            //place badge text
-            [self badgeString: downloadRateString forRect: stringRect];
+            
+            if (downloadRateString)
+            {
+                //download rate above upload rate
+                if (uploadRateString)
+                {
+                    float spaceBetween = badgeRect.size.height + 2.0;
+                    badgeRect.origin.y += spaceBetween;
+                    stringRect.origin.y += spaceBetween;
+                }
+            
+                //place badge and text
+                [fDownloadBadge compositeToPoint: badgeRect.origin operation: NSCompositeSourceOver];
+                [self badgeString: downloadRateString forRect: stringRect];
+            }
+            
+            [dockIcon unlockFocus];
         }
-        
-        [dockIcon unlockFocus];
     }