Changeset 5475

Show
Ignore:
Timestamp:
04/25/08 00:48:06 (3 weeks ago)
Author:
morris
Message:

Use CoreAnimation? for overlay and HUD instead of own animator

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • Spiral/trunk/English.lproj/Overlay.nib/info.nib

    r5121 r5475  
    55        <key>IBFramework Version</key> 
    66        <string>629</string> 
    7         <key>IBLastKnownRelativeProjectPath</key> 
    8         <string>../../Spiral.xcodeproj</string> 
    97        <key>IBOldestOS</key> 
    108        <integer>5</integer> 
    …… 
    1210        <array/> 
    1311        <key>IBSystem Version</key> 
    14         <string>9B18</string> 
     12        <string>9C7010</string> 
    1513        <key>targetFramework</key> 
    1614        <string>IBCocoaFramework</string> 

  • Spiral/trunk/SPFullscreenWindow.m

    r5459 r5475  
    4141        [NSCursor setHiddenUntilMouseMoves:YES]; 
    4242         
    43         [_hudWindow orderOut:self animate:YES]; 
     43        [[_hudWindow animator] setAlphaValue:0.0]; 
    4444         
    4545        [_timer setFireDate:[NSDate dateWithTimeIntervalSinceNow:[_timer timeInterval]]]; 
    …… 
    130130 
    131131- (void)orderFrontHUDWindow { 
    132         if(![_hudWindow isVisible]) 
    133                 [_hudWindow orderFront:self animate:YES]; 
     132        if(![_hudWindow isVisible]) { 
     133                [_hudWindow setAlphaValue:0.0]; 
     134                [_hudWindow orderFront:self]; 
     135        } 
     136 
     137        [[_hudWindow animator] setAlphaValue:1.0]; 
    134138 
    135139        if(NSPointInRect([NSEvent mouseLocation], [_hudWindow frame])) 

  • Spiral/trunk/SPMovieController.m

    r5474 r5475  
    9595                [[_overlayTextField window] setAlphaValue:1.0]; 
    9696 
     97                [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(_animateHideOverlayWindow) object:NULL]; 
     98 
    9799                if(!hold) 
    98                         [self performSelectorOnce:@selector(_flashOverlayString:) withObject:@"" afterDelay:2.0]; 
    99  
    100                 [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(_animateHideOverlayWindow) object:NULL]; 
    101         } else { 
    102                 [self performSelectorOnce:@selector(_animateHideOverlayWindow) afterDelay:0.03]; 
     100                        [self performSelectorOnce:@selector(_animateHideOverlayWindow) afterDelay:2.0]; 
    103101        } 
    104102} 
    …… 
    107105 
    108106- (void)_hideOverlayWindow { 
    109         [[_overlayTextField window] setAlphaValue:0.0]; 
     107        [_overlayWindow setAlphaValue:0.0]; 
    110108} 
    111109 
    …… 
    113111 
    114112- (void)_animateHideOverlayWindow { 
    115         float           alpha; 
    116          
    117         alpha = [[_overlayTextField window] alphaValue] - 0.1; 
    118          
    119         [[_overlayTextField window] setAlphaValue:alpha]; 
    120          
    121         if(alpha > 0.0) 
    122                 [self performSelector:@selector(_animateHideOverlayWindow) afterDelay:0.03]; 
    123         else 
    124                 [_overlayTextField setStringValue:@""]; 
     113        [[_overlayWindow animator] setAlphaValue:0.0]; 
    125114} 
    126115 
    …… 
    11191108                [self _flashOverlayString:[NSSWF:NSLS(@"Rewind: %.0fx", @"Rewind overlay"), fabs(rate)] hold:YES]; 
    11201109        else 
    1121                 [self _flashOverlayString:@""]; 
     1110                [self _animateHideOverlayWindow]; 
    11221111} 
    11231112