Changeset 2136

Timestamp:

Jun 17, 2007, 4:23:37 PM (15 years ago)

Author:

livings124

Message:

initialize the overlay window when it is first needed instead of at launch

Location:

branches/file_selection

Files:

• NEWS (modified) (1 diff)
• macosx/Controller.m (modified) (6 diffs)
• macosx/DragOverlayWindow.h (modified) (1 diff)
• macosx/DragOverlayWindow.m (modified) (3 diffs)

branches/file_selection/NEWS

@@ -5 +5 @@
  - Torrent file creation
  - Partial licensing change -- see the LICENSE file for details
- - Fix to UPnP support
+ - Fix to UPnP
  - Rechecking torrents is now done one torrent at a time
    to avoid hammering the disk

branches/file_selection/macosx/Controller.m

@@ -173 +173 @@
         
         fBadger = [[Badger alloc] initWithLib: fLib];
-        fOverlayWindow = [[DragOverlayWindow alloc] initWithLib: fLib];
         
         fIPCController = [[IPCController alloc] init];
@@ -198 +197 @@
     [fDisplayedTorrents release];
     [fBadger release];
-    [fOverlayWindow release];
+    if (fOverlayWindow)
+        [fOverlayWindow release];
     [fIPCController release];
     
@@ -215 +215 @@
     
     [fWindow setAcceptsMouseMovedEvents: YES]; //ensure filter buttons display correctly
-    [fWindow addChildWindow: fOverlayWindow ordered: NSWindowAbove];
     
     fToolbar = [[NSToolbar alloc] initWithIdentifier: @"Transmission Toolbar"];
@@ -2141 +2140 @@
                 tr_torrentClose(tempTor);
                 
-                [fOverlayWindow setFiles: files];
+                if (!fOverlayWindow)
+                    fOverlayWindow = [[DragOverlayWindow alloc] initWithLib: fLib forWindow: fWindow];
+                [fOverlayWindow setTorrents: files];
                 
                 return NSDragOperationCopy;
@@ -2149 +2150 @@
     else if ([[pasteboard types] containsObject: NSURLPboardType])
     {
+        if (!fOverlayWindow)
+            fOverlayWindow = [[DragOverlayWindow alloc] initWithLib: fLib forWindow: fWindow];
         [fOverlayWindow setURL: [[NSURL URLFromPasteboard: pasteboard] relativeString]];
         
@@ -2160 +2163 @@
 - (void) draggingExited: (id <NSDraggingInfo>) info
 {
-    [fOverlayWindow fadeOut];
+    if (fOverlayWindow)
+        [fOverlayWindow fadeOut];
 }
 
 - (BOOL) performDragOperation: (id <NSDraggingInfo>) info
 {
-    [fOverlayWindow fadeOut];
+    if (fOverlayWindow)
+        [fOverlayWindow fadeOut];
     
     NSPasteboard * pasteboard = [info draggingPasteboard];

branches/file_selection/macosx/DragOverlayWindow.h

@@ -30 +30 @@
     tr_handle_t * fLib;
     
-    //NSTimer * fFadeInTimer, * fFadeOutTimer;
     NSViewAnimation * fFadeInAnimation, * fFadeOutAnimation;
 }
 
-- (void) setFiles: (NSArray *) files;
+- (id) initWithLib: (tr_handle_t *) lib forWindow: (NSWindow *) window;
+- (void) setTorrents: (NSArray *) files;
 - (void) setURL: (NSString *) url;
 

branches/file_selection/macosx/DragOverlayWindow.m

@@ -29 +29 @@
 @implementation DragOverlayWindow
 
-- (id) initWithLib: (tr_handle_t *) lib
+- (id) initWithLib: (tr_handle_t *) lib forWindow: (NSWindow *) window
 {
     if (self = ([super initWithContentRect: NSMakeRect(0, 0, 1.0, 1.0) styleMask: NSBorderlessWindowMask
@@ -58 +58 @@
         [fFadeOutAnimation setDuration: 0.5];
         [fFadeOutAnimation setAnimationBlockingMode: NSAnimationNonblockingThreaded];
+        
+        [window addChildWindow: self ordered: NSWindowAbove];
     }
     return self;
@@ -70 +72 @@
 }
 
-- (void) setFiles: (NSArray *) files
+- (void) setTorrents: (NSArray *) files
 {
     uint64_t size = 0;