From: Matthew Judy <mjudy@ithinksw.com>
Date: Sun, 2 Feb 2003 03:22:19 +0000 (+0000)
Subject: The Pivot effect is now a part of ITTransientStatusWindow, and includes both EIEO... 
X-Git-Tag: v0.1~57
X-Git-Url: http://git.ithinksw.org/ITKit.git/commitdiff_plain/766d5d9af104b68f61f3b09abac3f4cc88839ce6

The Pivot effect is now a part of ITTransientStatusWindow, and includes both EIEO interpolation and alpha effect.  The showcase has been modified to support this.
---

diff --git a/ITTransientStatusWindow.h b/ITTransientStatusWindow.h
index adaf75a..e3ea9dc 100755
--- a/ITTransientStatusWindow.h
+++ b/ITTransientStatusWindow.h
@@ -19,7 +19,7 @@
 
 
 #define DEFAULT_EXIT_DELAY  3.0
-#define DEFAULT_EFFECT_TIME 0.33
+#define DEFAULT_EFFECT_TIME 1.0
 
 
 @class ITTextField;
@@ -75,13 +75,14 @@ typedef enum {                                      // Note: Entry effects descr
     ITTransientStatusWindowEffect          _entryEffect;
     ITTransientStatusWindowEffect          _exitEffect;
     float                                  _effectTime;
+    double                                 _effectProgress;
     ITTransientStatusWindowPosition        _verticalPosition;
     ITTransientStatusWindowPosition        _horizontalPosition;
 
     BOOL _reallyIgnoresEvents;
     
     NSTimer *_delayTimer;
-    NSTimer *_fadeTimer;
+    NSTimer *_effectTimer;
 
 //  NSView *_contentSubView;		
 }
@@ -111,7 +112,5 @@ typedef enum {                                      // Note: Entry effects descr
 - (ITTransientStatusWindowEffect)exitEffect;
 - (void)setExitEffect:(ITTransientStatusWindowEffect)newEffect;
 
-- (void)setRotation:(float)angle;
-
 
 @end
diff --git a/ITTransientStatusWindow.m b/ITTransientStatusWindow.m
index 45ad1e3..6f66159 100755
--- a/ITTransientStatusWindow.m
+++ b/ITTransientStatusWindow.m
@@ -4,8 +4,9 @@
 #import "ITTextField.h"
 #import "ITGrayRoundedView.h"
 
-@class ITTextField;
-@class ITGrayRoundedView;
+
+#define EFFECT_FPS 30.0
+
 
 /*************************************************************************/
 #pragma mark -
@@ -28,9 +29,13 @@
            backgroundType:(ITTransientStatusWindowBackgroundType)backgroundType;
 - (void)rebuildWindow;
 - (void)performEffect;
-- (void)dissolveEffect:(BOOL)entering;
-- (void)slideVerticalEffect:(BOOL)entering;
-- (void)slideHorizontalEffect:(BOOL)entering;
+- (void)dissolveEffect;
+- (void)slideVerticalEffect;
+- (void)slideHorizontalEffect;
+- (void)pivotEffect;
+- (void)pivotStep;
+- (void)pivotFinish;
+- (void)setPivot:(float)angle;
 @end
 
 
@@ -91,12 +96,14 @@ static ITTransientStatusWindow *staticWindow = nil;
         _backgroundType      = backgroundType;
         _verticalPosition    = ITTransientStatusWindowPositionBottom;
         _horizontalPosition  = ITTransientStatusWindowPositionLeft;
-        _entryEffect         = ITTransientStatusWindowEffectNone;
+//      _entryEffect         = ITTransientStatusWindowEffectNone;
+        _entryEffect         = ITTransientStatusWindowEffectPivot;
         _exitEffect          = ITTransientStatusWindowEffectDissolve;
         _effectTime          = DEFAULT_EFFECT_TIME;
+        _effectProgress      = 0.00;
         _reallyIgnoresEvents = YES;
-        _delayTimer = nil;
-        _fadeTimer  = nil;
+        _delayTimer          = nil;
+        _effectTimer         = nil;
 
 //        if ( _backgroundType == ITTransientStatusWindowRounded ) {
 //            _contentSubView = contentView;
@@ -118,18 +125,6 @@ static ITTransientStatusWindow *staticWindow = nil;
 #pragma mark INSTANCE METHODS
 /*************************************************************************/
 
-- (void)setRotation:(float)angle
-{
-    CGAffineTransform transform = CGAffineTransformMakeRotation(angle);
-    transform.tx = -32.0;
-    transform.ty = [self frame].size.height + 32.0;
-    CGSSetWindowTransform([NSApp contextID],
-                          (CGSWindowID)[self windowNumber],
-                          CGAffineTransformTranslate(transform,
-                                                     (([self frame].origin.x - 32.0) * -1),
-                                                     (([[self screen] frame].size.height - ([self frame].origin.y) + 32.0) * -1) ));
-}
-
 - (BOOL)ignoresMouseEvents
 {
     return _reallyIgnoresEvents;
@@ -157,6 +152,7 @@ static ITTransientStatusWindow *staticWindow = nil;
 
     if ( _entryEffect == ITTransientStatusWindowEffectNone ) {
         [super orderFront:sender];
+        _visibilityState = ITTransientStatusWindowVisibleState;
     } else {
         [self performEffect];
     }
@@ -170,6 +166,7 @@ static ITTransientStatusWindow *staticWindow = nil;
 
     if ( _entryEffect == ITTransientStatusWindowEffectNone ) {
         [super makeKeyAndOrderFront:sender];
+        _visibilityState = ITTransientStatusWindowVisibleState;
     } else {
         [self performEffect];
         [self makeKeyWindow];
@@ -180,6 +177,7 @@ static ITTransientStatusWindow *staticWindow = nil;
 {
     if ( _entryEffect == ITTransientStatusWindowEffectNone ) {
         [super orderOut:sender];
+        _visibilityState = ITTransientStatusWindowHiddenState;
     } else {
         [self performEffect];
     }
@@ -321,50 +319,116 @@ static ITTransientStatusWindow *staticWindow = nil;
 - (void)performEffect
 {
     if ( _visibilityState == ITTransientStatusWindowHiddenState ) {
-        if ( _entryEffect == ITTransientStatusWindowEffectDissolve ) {
-            [self dissolveEffect:YES];
-        } else if ( _entryEffect == ITTransientStatusWindowEffectSlideVertically ) {
-            [self slideVerticalEffect:YES];
-        } else if ( _entryEffect == ITTransientStatusWindowEffectSlideHorizontally ) {
-            [self slideHorizontalEffect:YES];
-        }
+        _visibilityState = ITTransientStatusWindowEnteringState;
     } else if ( _visibilityState == ITTransientStatusWindowVisibleState ) {
-        if ( _exitEffect == ITTransientStatusWindowEffectDissolve ) {
-            [self dissolveEffect:NO];
-        } else if ( _exitEffect == ITTransientStatusWindowEffectSlideVertically ) {
-            [self slideVerticalEffect:NO];
-        } else if ( _exitEffect == ITTransientStatusWindowEffectSlideHorizontally ) {
-            [self slideHorizontalEffect:NO];
-        }
+        _visibilityState = ITTransientStatusWindowExitingState;
+    } else {
+        return;
+    }
+        
+    if ( _entryEffect == ITTransientStatusWindowEffectDissolve ) {
+        [self dissolveEffect];
+    } else if ( _entryEffect == ITTransientStatusWindowEffectSlideVertically ) {
+        [self slideVerticalEffect];
+    } else if ( _entryEffect == ITTransientStatusWindowEffectSlideHorizontally ) {
+        [self slideHorizontalEffect];
+    } else if ( _entryEffect == ITTransientStatusWindowEffectPivot ) {
+        [self pivotEffect];
     }
 }
 
-- (void)dissolveEffect:(BOOL)entering
+- (void)dissolveEffect
 {
-    if ( entering ) {
+    if ( _visibilityState == ITTransientStatusWindowEnteringState ) {
         [super orderFront:self];
+        _visibilityState = ITTransientStatusWindowVisibleState;
     } else {
         [super orderOut:self];
+        _visibilityState = ITTransientStatusWindowHiddenState;
     }
 }
 
-- (void)slideVerticalEffect:(BOOL)entering
+- (void)slideVerticalEffect
 {
-    if ( entering ) {
+    if ( _visibilityState == ITTransientStatusWindowEnteringState ) {
         [super orderFront:self];
+        _visibilityState = ITTransientStatusWindowVisibleState;
     } else {
         [super orderOut:self];
+        _visibilityState = ITTransientStatusWindowHiddenState;
     }
 }
 
-- (void)slideHorizontalEffect:(BOOL)entering
+- (void)slideHorizontalEffect
 {
-    if ( entering ) {
+    if ( _visibilityState == ITTransientStatusWindowEnteringState ) {
         [super orderFront:self];
+        _visibilityState = ITTransientStatusWindowVisibleState;
     } else {
         [super orderOut:self];
+        _visibilityState = ITTransientStatusWindowHiddenState;
     }
 }
 
+- (void)pivotEffect
+{
+    if ( _visibilityState == ITTransientStatusWindowEnteringState ) {
+        [self setPivot:315.0];
+        _effectProgress = 0.0;
+        [self setAlphaValue:0.0];
+        [super orderFront:self];
+        _effectTimer = [NSTimer scheduledTimerWithTimeInterval:(1.0 / EFFECT_FPS)
+                                                        target:self
+                                                      selector:@selector(pivotStep)
+                                                      userInfo:nil
+                                                       repeats:YES];
+    } else {
+        [super orderOut:self];
+        _visibilityState = ITTransientStatusWindowHiddenState;
+    }
+}
+
+- (void)pivotStep
+{
+    if ( _visibilityState == ITTransientStatusWindowEnteringState ) {
+        float interPivot = 0.0;
+        _effectProgress += (1.0 / (EFFECT_FPS * _effectTime));
+        _effectProgress = (_effectProgress < 1.0 ? _effectProgress : 1.0);
+        interPivot = (( sin((_effectProgress * pi) - (pi / 2)) + 1 ) / 2);
+        [self setPivot:((interPivot * 45) + 315)];
+        [self setAlphaValue:interPivot];
+        if ( _effectProgress >= 1.0 ) {
+            [self pivotFinish];
+        }
+    } else {
+        //backwards
+    }
+}
+
+- (void)pivotFinish
+{
+    if ( _visibilityState == ITTransientStatusWindowEnteringState ) {
+        [_effectTimer invalidate];
+        _effectTimer = nil;
+        _effectProgress = 0.0;
+        _visibilityState = ITTransientStatusWindowVisibleState;
+    } else {
+        //backwards
+    }
+}
+
+
+- (void)setPivot:(float)angle
+{
+    float degAngle = (angle * (pi / 180));
+    CGAffineTransform transform = CGAffineTransformMakeRotation(degAngle);
+    transform.tx = -32.0;
+    transform.ty = [self frame].size.height + 32.0;
+    CGSSetWindowTransform([NSApp contextID],
+                          (CGSWindowID)[self windowNumber],
+                          CGAffineTransformTranslate(transform,
+                                                     (([self frame].origin.x - 32.0) * -1),
+                                                     (([[self screen] frame].size.height - ([self frame].origin.y) + 32.0) * -1) ));
+}
 
 @end
diff --git a/Showcase/Controller.m b/Showcase/Controller.m
index d7808c7..2d0c09a 100755
--- a/Showcase/Controller.m
+++ b/Showcase/Controller.m
@@ -202,19 +202,23 @@
 
 - (IBAction)showStatusWindow:(id)sender
 {
-//    [[statusWindow contentView] setNeedsDisplay:YES];
+    [[statusWindow contentView] setNeedsDisplay:YES];
+/*
     [statusWindow setFrame:NSMakeRect( (0.0 - NSWidth([statusWindow frame])),
                                        SW_BORDER,
                                        NSWidth([statusWindow frame]),
                                        NSHeight([statusWindow frame]) )
                    display:YES];
+*/
     [statusWindow orderFront:self];
+/*
     [statusWindow setFrame:NSMakeRect( SW_BORDER,
                                        SW_BORDER,
                                        NSWidth([statusWindow frame]),
                                        NSHeight([statusWindow frame]) )
                    display:YES
                    animate:YES];
+*/
 }
 
 - (IBAction)hideStatusWindow:(id)sender
@@ -224,7 +228,7 @@
 
 - (IBAction)setRotation:(id)sender
 {
-    [statusWindow setRotation:([sender floatValue] * (pi / 180))];
+    [statusWindow setPivot:[sender floatValue]];
 }
 
 /*************************************************************************/