Changeset 1087 for trunk

Timestamp:

Nov 13, 2006, 5:18:20 PM (16 years ago)

Author:

livings124

Message:

more consistent dock badging

Location:

trunk/macosx

Files:

• Badger.h (modified) (1 diff)
• Badger.m (modified) (6 diffs)

trunk/macosx/Badger.h

@@ -31 +31 @@
 
     NSImage         * fDockIcon, * fBadge, * fUploadBadge, * fDownloadBadge;
-                    
     NSDictionary    * fAttributes;
-    BOOL            fNonDefault;
 }
 

trunk/macosx/Badger.m

@@ -38 +38 @@
     if ((self = [super init]))
     {
+        fDockIcon = [[NSApp applicationIconImage] copy];
         fBadge = [NSImage imageNamed: @"Badge"];
-        fDockIcon = [[NSApp applicationIconImage] copy];
         fUploadBadge = [NSImage imageNamed: @"UploadBadge"];
         fDownloadBadge = [NSImage imageNamed: @"DownloadBadge"];
@@ -55 +55 @@
         
         [stringShadow release];
-        
-        fNonDefault = NO;
     }
     
@@ -72 +70 @@
 - (void) updateBadgeWithCompleted: (int) completed uploadRate: (float) uploadRate downloadRate: (float) downloadRate
 {
+    NSImage * dockIcon;
     NSSize iconSize = [fDockIcon size];
-
-    NSImage * dockIcon = nil;
         
     //set completed badge to top right
@@ -109 +106 @@
                                     ? [NSString stringForSpeedAbbrev: downloadRate] : nil;
     
-    BOOL speedShown = uploadRateString || downloadRateString;
-    if (speedShown)
+    if (uploadRateString || downloadRateString)
     {
         if (!dockIcon)
@@ -156 +152 @@
     }
     
-    if (fNonDefault || dockIcon)
-    {
-        if (!dockIcon)
-        {
-            fNonDefault = NO;
-            dockIcon = [fDockIcon retain];
-        }
-        else
-            fNonDefault = YES;
-        
-        [NSApp setApplicationIconImage: dockIcon];
-        [dockIcon release];
-    }
+    //update dock badge
+    if (!dockIcon)
+        dockIcon = [fDockIcon retain];
+    
+    [NSApp setApplicationIconImage: dockIcon];
+    [dockIcon release];
 }
 
@@ -174 +163 @@
 {
     [NSApp setApplicationIconImage: fDockIcon];
-    fNonDefault = NO;
 }