Changeset 3440

Timestamp:

Oct 17, 2007, 4:04:51 PM (15 years ago)

Author:

livings124

Message:

changing some constants into #define

File:

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

trunk/macosx/Badger.m

@@ -26 +26 @@
 #import "NSStringAdditions.h"
 
+#define COMPLETED_BOTTOM_PADDING 5.0
+#define SPEED_BOTTOM_PADDING 2.0
+#define SPEED_BETWEEN_PADDING 2.0
+
 @interface Badger (Private)
 
@@ -59 +63 @@
 {
     //set completed badge to top right
-    BOOL baseChange = fCompleted != fCompletedBadged;
-    if (baseChange)
+    BOOL completedChange = fCompleted != fCompletedBadged;
+    if (completedChange)
     {
         fCompletedBadged = fCompleted;
@@ -89 +93 @@
             
             //ignore shadow of badge when placing string
-            float badgeBottomExtra = 5.0;
-            badgeRect.size.height -= badgeBottomExtra;
-            badgeRect.origin.y += badgeBottomExtra;
+            badgeRect.size.height -= COMPLETED_BOTTOM_PADDING;
+            badgeRect.origin.y += COMPLETED_BOTTOM_PADDING;
             
             //place badge text
@@ -136 +139 @@
             //ignore shadow of badge when placing string
             NSRect stringRect = badgeRect;
-            float badgeBottomExtra = 2.0;
-            stringRect.size.height -= badgeBottomExtra;
-            stringRect.origin.y += badgeBottomExtra;
+            stringRect.size.height -= SPEED_BOTTOM_PADDING;
+            stringRect.origin.y += SPEED_BOTTOM_PADDING;
             
             [dockIcon lockFocus];
@@ -154 +156 @@
                 if (uploadRateString)
                 {
-                    float spaceBetween = badgeRect.size.height + 2.0;
+                    float spaceBetween = badgeRect.size.height + SPEED_BETWEEN_PADDING;
                     badgeRect.origin.y += spaceBetween;
                     stringRect.origin.y += spaceBetween;
@@ -169 +171 @@
     
     //update dock badge
-    if (baseChange || fSpeedBadge || speedBadge)
+    if (completedChange || fSpeedBadge || speedBadge)
     {
         [NSApp setApplicationIconImage: dockIcon ? dockIcon : fDockIcon];