Changeset 3394

Timestamp:

Oct 13, 2007, 1:54:19 PM (15 years ago)

Author:

livings124

Message:

fix a redundant check...all this destination code probably needs cleaning up sooner or later

Location:

trunk/macosx

Files:

• DragOverlayView.m (modified) (4 diffs)
• Torrent.m (modified) (1 diff)

trunk/macosx/DragOverlayView.m

@@ -25 +25 @@
 #import "DragOverlayView.h"
 #import "NSBezierPathAdditions.h"
+
+#define PADDING 10.0
 
 @implementation DragOverlayView
@@ -87 +89 @@
 - (void) setOverlay: (NSImage *) icon mainLine: (NSString *) mainLine subLine: (NSString *) subLine
 {
-    if (fBadge)
-        [fBadge release];
+    [fBadge release];
     fBadge = [fBackBadge copy];
     NSSize badgeSize = [fBadge size];
@@ -111 +112 @@
     }
     
-    float padding = 10.0;
-    
     [fBadge lockFocus];
     
     //place icon
-    [icon compositeToPoint: NSMakePoint(padding, (badgeSize.height - iconSize.height) * 0.5)
+    [icon compositeToPoint: NSMakePoint(PADDING, (badgeSize.height - iconSize.height) * 0.5)
                 operation: NSCompositeSourceOver];
     [icon release];
@@ -124 +123 @@
     NSSize subLineSize = [subLine sizeWithAttributes: fSubLineAttributes];
     
-    NSRect lineRect = NSMakeRect(padding + iconSize.width + 5.0,
+    NSRect lineRect = NSMakeRect(PADDING + iconSize.width + 5.0,
                         (badgeSize.height + (subLineSize.height + 2.0 - mainLineSize.height)) * 0.5,
-                        badgeSize.width - (padding + iconSize.width + 2.0) - padding, mainLineSize.height);
+                        badgeSize.width - (PADDING + iconSize.width + 2.0) - PADDING, mainLineSize.height);
     [mainLine drawInRect: lineRect withAttributes: fMainLineAttributes];
     

trunk/macosx/Torrent.m

@@ -556 +556 @@
         return;
     
-    NSString * folder = [[openPanel filenames] objectAtIndex: 0];
-    if (fUseIncompleteFolder)
-        [self changeDownloadFolder: folder];
-    else
-        [self changeDownloadFolder: folder];
+    [self changeDownloadFolder: [[openPanel filenames] objectAtIndex: 0]];
     
     [self startTransfer];