mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-03-03 18:25:35 +00:00
Code Issues Releases Wiki Activity

use 10.4's animation code for the drag overlay's fades

Browse source
This commit is contained in:
Mitchell Livingston 2007-05-21 21:07:47 +00:00
parent 9ed0d168e7
commit 8477672f73
3 changed files with 25 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
macosx/Controller.m
View file

@ -2122,12 +2122,12 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
- (void) draggingExited: (id <NSDraggingInfo>) info
{
[fOverlayWindow closeFadeOut];
[fOverlayWindow fadeOut];
}
- (BOOL) performDragOperation: (id <NSDraggingInfo>) info
{
[fOverlayWindow closeFadeOut];
[fOverlayWindow fadeOut];
NSPasteboard * pasteboard = [info draggingPasteboard];
if ([[pasteboard types] containsObject: NSFilenamesPboardType])
@ -2158,7 +2158,6 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
if ((url = [NSURL URLFromPasteboard: pasteboard]))
{
[self openURL: url];
return YES;
}
}

5
macosx/DragOverlayWindow.h
View file

@ -29,12 +29,13 @@
{
tr_handle_t * fLib;
NSTimer * fFadeInTimer, * fFadeOutTimer;
//NSTimer * fFadeInTimer, * fFadeOutTimer;
NSViewAnimation * fFadeInAnimation, * fFadeOutAnimation;
}
- (void) setFiles: (NSArray *) files;
- (void) setURL: (NSString *) url;
- (void) closeFadeOut;
- (void) fadeOut;
@end

88
macosx/DragOverlayWindow.m
View file

@ -26,14 +26,6 @@
#import "DragOverlayView.h"
#import "StringAdditions.h"
@interface DragOverlayWindow (Private)
- (void) beginFadeIn;
- (void) fadeIn;
- (void) fadeOut;
@end
@implementation DragOverlayWindow
- (id) initWithLib: (tr_handle_t *) lib
@ -54,16 +46,25 @@
[self setReleasedWhenClosed: NO];
[self setIgnoresMouseEvents: YES];
fFadeInAnimation = [[NSViewAnimation alloc] initWithViewAnimations: [NSArray arrayWithObject:
[NSDictionary dictionaryWithObjectsAndKeys: self, NSViewAnimationTargetKey,
NSViewAnimationFadeInEffect, NSViewAnimationEffectKey, nil]]];
[fFadeInAnimation setDuration: 0.2];
fFadeOutAnimation = [[NSViewAnimation alloc] initWithViewAnimations: [NSArray arrayWithObject:
[NSDictionary dictionaryWithObjectsAndKeys: self, NSViewAnimationTargetKey,
NSViewAnimationFadeOutEffect, NSViewAnimationEffectKey, nil]]];
[fFadeOutAnimation setDuration: 0.5];
[fFadeOutAnimation setAnimationBlockingMode: NSAnimationBlocking];
}
return self;
}
- (void) dealloc
{
if (fFadeInTimer)
[fFadeOutTimer invalidate];
if (fFadeOutTimer)
[fFadeOutTimer invalidate];
[fFadeInAnimation release];
[fFadeOutAnimation release];
[super dealloc];
}
@ -113,7 +114,8 @@
[[self contentView] setOverlay: icon mainLine: name subLine: sizeString];
[self beginFadeIn];
[fFadeOutAnimation stopAnimation];
[fFadeInAnimation startAnimation];
}
- (void) setURL: (NSString *) url
@ -121,65 +123,15 @@
[[self contentView] setOverlay: [NSImage imageNamed: @"Globe.tiff"]
mainLine: NSLocalizedString(@"Web Address", "Drag overlay -> url") subLine: url];
[self beginFadeIn];
}
- (void) closeFadeOut
{
if (fFadeInTimer)
{
[fFadeInTimer invalidate];
fFadeInTimer = nil;
}
if (fFadeOutTimer)
{
[fFadeOutTimer invalidate];
fFadeOutTimer = nil;
}
fFadeOutTimer = [NSTimer scheduledTimerWithTimeInterval: 0.015 target: self
selector: @selector(fadeOut) userInfo: nil repeats: YES];
}
@end
@implementation DragOverlayWindow (Private)
- (void) beginFadeIn
{
if (fFadeInTimer)
{
[fFadeInTimer invalidate];
fFadeInTimer = nil;
}
if (fFadeOutTimer)
{
[fFadeOutTimer invalidate];
fFadeOutTimer = nil;
}
fFadeInTimer = [NSTimer scheduledTimerWithTimeInterval: 0.0075 target: self
selector: @selector(fadeIn) userInfo: nil repeats: YES];
}
- (void) fadeIn
{
[self setAlphaValue: [self alphaValue] + 0.1];
if ([self alphaValue] >= 1.0)
{
[fFadeInTimer invalidate];
fFadeInTimer = nil;
}
[fFadeOutAnimation stopAnimation];
[fFadeInAnimation startAnimation];
}
#warning use delegate?
- (void) fadeOut
{
[self setAlphaValue: [self alphaValue] - 0.1];
if ([self alphaValue] <= 0.0)
{
[fFadeOutTimer invalidate];
fFadeOutTimer = nil;
}
[fFadeInAnimation stopAnimation];
[fFadeOutAnimation startAnimation];
}
@end