The dissolve, cut and slides all work properly now, I hope :D

[ITKit.git] / ITSlideHorizontallyWindowEffect.m

diff --git a/ITSlideHorizontallyWindowEffect.m b/ITSlideHorizontallyWindowEffect.m
index c5f3fba..2382cc4 100755 (executable)
--- a/ITSlideHorizontallyWindowEffect.m
+++ b/ITSlideHorizontallyWindowEffect.m
@@ -1,28 +1,185 @@
 #import "ITSlideHorizontallyWindowEffect.h"
 #import "ITSlideHorizontallyWindowEffect.h"

+#import "ITCoreGraphicsHacks.h"
+#import "ITTransientStatusWindow.h"
+
+
+@interface ITSlideHorizontallyWindowEffect (Private)
+- (void)performAppearFromProgress:(float)progress effectTime:(float)time;
+- (void)appearStep;
+- (void)appearFinish;
+- (void)performVanishFromProgress:(float)progress effectTime:(float)time;
+- (void)vanishStep;
+- (void)vanishFinish;
+- (void)setSlide:(float)distance;
+@end

 
 
 @implementation ITSlideHorizontallyWindowEffect
 
 
 
 
 @implementation ITSlideHorizontallyWindowEffect
 
 

+/*************************************************************************/
+#pragma mark -
+#pragma mark APPEAR METHODS
+/*************************************************************************/
+

 - (void)performAppear
 {
 - (void)performAppear
 {

-    NSLog(@"ITSlideHorizontallyWindowEffect does not implement performAppear.");
+    __idle = NO;
+
+    [self setWindowVisibility:ITWindowAppearingState];
+    [self performAppearFromProgress:0.0 effectTime:_effectTime];

 }
 
 }
 

-- (void)performVanish
+- (void)performAppearFromProgress:(float)progress effectTime:(float)time
+{
+    [_window setEffectProgress:progress];
+    _effectSpeed = (1.0 / (EFFECT_FPS * time));
+
+    if ( progress == 0.0 ) {
+        [_window setAlphaValue:0.0];
+    }
+
+    [_window orderFront:self];
+    _effectTimer = [NSTimer scheduledTimerWithTimeInterval:(1.0 / EFFECT_FPS)
+                                                    target:self
+                                                  selector:@selector(appearStep)
+                                                  userInfo:nil
+                                                   repeats:YES];
+}
+
+- (void)appearStep

 {
 {

-    NSLog(@"ITSlideHorizontallyWindowEffect does not implement performVanish.");
+    float interSlide = 0.0;
+    [_window setEffectProgress:([_window effectProgress] + _effectSpeed)];
+    [_window setEffectProgress:( ([_window effectProgress] < 1.0) ? [_window effectProgress] : 1.0)];
+    interSlide = (( sin(([_window effectProgress] * pi) - (pi / 2)) + 1 ) / 2);
+    [self setSlide:( [_window frame].size.width - (interSlide * [_window frame].size.width) )];
+    [_window setAlphaValue:interSlide];
+
+    if ( [_window effectProgress] >= 1.0 ) {
+        [self appearFinish];
+    }
+}
+
+- (void)appearFinish
+{
+    [_effectTimer invalidate];
+    _effectTimer = nil;
+    [self setWindowVisibility:ITWindowVisibleState];
+
+    __idle = YES;
+
+    if ( __shouldReleaseWhenIdle ) {
+        [self release];
+    }

 }
 
 - (void)cancelAppear
 {
 }
 
 - (void)cancelAppear
 {

-    NSLog(@"ITSlideHorizontallyWindowEffect does not implement cancelAppear.");
+    [self setWindowVisibility:ITWindowVanishingState];
+
+    [_effectTimer invalidate];
+    _effectTimer = nil;
+
+    [self performVanishFromProgress:[_window effectProgress] effectTime:(_effectTime / 4.0)];

 }
 
 }
 

-- (void)cancelVanish
+
+/*************************************************************************/
+#pragma mark -
+#pragma mark VANISH METHODS
+/*************************************************************************/
+
+- (void)performVanish
+{
+    __idle = NO;
+
+    [self setWindowVisibility:ITWindowVanishingState];
+    [self performVanishFromProgress:1.0 effectTime:_effectTime];
+}
+
+- (void)performVanishFromProgress:(float)progress effectTime:(float)time

 {
 {

-    NSLog(@"ITSlideHorizontallyWindowEffect does not implement cancelVanish.");
+    [_window setEffectProgress:progress];
+    _effectSpeed = (1.0 / (EFFECT_FPS * time));
+    if ( progress == 1.0 ) {
+        [_window setAlphaValue:1.0];
+    }
+
+    [_window orderFront:self];
+    _effectTimer = [NSTimer scheduledTimerWithTimeInterval:(1.0 / EFFECT_FPS)
+                                                    target:self
+                                                  selector:@selector(vanishStep)
+                                                  userInfo:nil
+                                                   repeats:YES];

 }
 
 }
 

+- (void)vanishStep
+{
+    float interSlide = 1.0;
+    [_window setEffectProgress:([_window effectProgress] - _effectSpeed)];
+    [_window setEffectProgress:( ([_window effectProgress] > 0.0) ? [_window effectProgress] : 0.0)];
+    interSlide = (( sin(([_window effectProgress] * pi) - (pi / 2)) + 1 ) / 2);
+    [self setSlide:( [_window frame].size.width - (interSlide * [_window frame].size.width) )];
+    [_window setAlphaValue:interSlide];
+
+    if ( [_window effectProgress] <= 0.0 ) {
+        [self vanishFinish];
+    }
+}
+
+- (void)vanishFinish
+{
+    [_effectTimer invalidate];
+    _effectTimer = nil;
+    [_window orderOut:self];
+    [_window setAlphaValue:1.0];
+    [self setSlide:0.0];
+    [self setWindowVisibility:ITWindowHiddenState];

 
 

+    __idle = YES;
+    
+    if ( __shouldReleaseWhenIdle ) {
+        [self release];
+    }
+}
+
+- (void)cancelVanish
+{
+    [self setWindowVisibility:ITWindowAppearingState];
+
+    [_effectTimer invalidate];
+    _effectTimer = nil;
+
+    [self performAppearFromProgress:[_window effectProgress] effectTime:(_effectTime / 4.0)];
+}
+
+- (void)setSlide:(float)distance
+{
+    CGAffineTransform transform;
+    float yPoint;
+    
+    if ( [(ITTransientStatusWindow *)_window verticalPosition] == ITWindowPositionTop ) {
+        yPoint = ( 64.0 + [[_window screen] visibleFrame].origin.y - [_window frame].size.height );
+    } else if ( [(ITTransientStatusWindow *)_window verticalPosition] == ITWindowPositionBottom ) {
+        yPoint = -( [[_window screen] frame].size.height - ( [_window frame].size.height + 32.0 + [[_window screen] visibleFrame].origin.y) );
+    } else if ( [(ITTransientStatusWindow *)_window verticalPosition] == ITWindowPositionMiddle ) {
+        yPoint = ( [_window frame].size.height - [[_window screen] visibleFrame].size.height) / 2;
+    }
+    
+    /*if ( [(ITTransientStatusWindow *)_window horizontalPosition] == ITWindowPositionLeft ) {
+        transform = CGAffineTransformMakeTranslation((distance - (32.0 + [[_window screen] visibleFrame].origin.x)),
+                                                    ( [(ITTransientStatusWindow *)_window verticalPosition] == ITWindowPositionBottom ) ? -( [[_window screen] frame].size.height - ( [_window frame].size.height + 32.0 + [[_window screen] visibleFrame].origin.y) ) : ( 64.0 + [[_window screen] visibleFrame].origin.y - [_window frame].size.height ) );
+    } else if ( [(ITTransientStatusWindow *)_window horizontalPosition] == ITWindowPositionRight ) {
+        transform = CGAffineTransformMakeTranslation(-((([[_window screen] visibleFrame].size.width + [[_window screen] visibleFrame].origin.x) + distance) - 32.0 - [_window frame].size.width),
+                                                    ( [(ITTransientStatusWindow *)_window verticalPosition] == ITWindowPositionBottom ) ? -( [[_window screen] frame].size.height - ( [_window frame].size.height + 32.0 + [[_window screen] visibleFrame].origin.y) ) : ( 64.0 + [[_window screen] visibleFrame].origin.y - [_window frame].size.height ) );
+    }*/
+    
+    transform = CGAffineTransformMakeTranslation( ( [(ITTransientStatusWindow *)_window horizontalPosition] == ITWindowPositionLeft ) ? (distance - (32.0 + [[_window screen] visibleFrame].origin.x)) : -((([[_window screen] visibleFrame].size.width + [[_window screen] visibleFrame].origin.x) + distance) - 32.0 - [_window frame].size.width),
+                                                 yPoint);
+    
+    CGSSetWindowTransform([NSApp contextID],
+                          (CGSWindowID)[_window windowNumber],
+                          transform);
+}

 @end
 @end