Fairly large ITTSW checkin.

[ITKit.git] / ITTransientStatusWindow.m

diff --git a/ITTransientStatusWindow.m b/ITTransientStatusWindow.m
index f2ed917..6cb33a3 100755 (executable)
--- a/ITTransientStatusWindow.m
+++ b/ITTransientStatusWindow.m
@@ -152,61 +152,32 @@ static ITTransientStatusWindow *staticWindow = nil;
 
 */
 
- - (IBAction)appear:(id)sender
- {
-    NSLog(@"%i", _visibilityState);
+- (IBAction)appear:(id)sender
+{
     if ( _visibilityState == ITTransientStatusWindowHiddenState ) {
          // Window is hidden.  Appear as normal, and start the timer.
-        if ( _entryEffect == nil ) {
-            [self orderFront:self];
-            _visibilityState = ITTransientStatusWindowVisibleState;
-        } else {
-            _visibilityState = ITTransientStatusWindowAppearingState;
-            [_entryEffect performAppear];
-            _visibilityState = ITTransientStatusWindowVisibleState;
-        }
-        [self startVanishTimer];
+        [_entryEffect performAppear];
     } else if ( _visibilityState == ITTransientStatusWindowVisibleState ) {
          // Window is completely visible.  Simply reset the timer.
         [self startVanishTimer];
     } else if ( _visibilityState == ITTransientStatusWindowAppearingState ) {
-         // Window is appearing.  Do nothing.
+         // Window is on its way in.  Do nothing.
     } else if ( _visibilityState == ITTransientStatusWindowVanishingState ) {
-        NSLog(@"%i", _visibilityState);
-        if ( _exitEffect == nil ) {
-            [self orderFront:self];
-            _visibilityState = ITTransientStatusWindowVisibleState;
-        } else {
-            _visibilityState = ITTransientStatusWindowAppearingState;
-            [_exitEffect cancelVanish];
-            _visibilityState = ITTransientStatusWindowVisibleState;
-        }
-        [self startVanishTimer];
+        // Window is on its way out.  Cancel the vanish.
+        [_exitEffect cancelVanish];
     }
- }
+}
 
 - (IBAction)vanish:(id)sender
 {
     if ( _visibilityState == ITTransientStatusWindowVisibleState ) {
         // Window is totally visible.  Perform exit effect.
-        if ( _exitEffect == nil ) {
-            [self orderOut:self];
-            _visibilityState = ITTransientStatusWindowHiddenState;
-        } else {
-            _visibilityState = ITTransientStatusWindowVanishingState;
-            NSLog(@"%i", _visibilityState);
-            [_exitEffect performVanish];
-            NSLog(@"%i", _visibilityState);
-            _visibilityState = ITTransientStatusWindowHiddenState;
-            NSLog(@"%i", _visibilityState);
-        }
-        [self startVanishTimer];
+        [_exitEffect performVanish];
     } else if ( _visibilityState == ITTransientStatusWindowHiddenState ) {
         // Window is hidden.  Do nothing.
     } else if ( _visibilityState == ITTransientStatusWindowAppearingState ) {
         // Window is on its way in.  Cancel appear.
         [_entryEffect cancelAppear];
-        _visibilityState = ITTransientStatusWindowHiddenState;
     } else if ( _visibilityState == ITTransientStatusWindowVanishingState ) {
         // Window is on its way out.  Do nothing.
     }
@@ -220,6 +191,10 @@ static ITTransientStatusWindow *staticWindow = nil;
 - (void)setVisibilityState:(ITWindowVisibilityState)newState
 {
     _visibilityState = newState;
+    
+    if ( _visibilityState == ITTransientStatusWindowVisibleState ) {
+        [self startVanishTimer];
+    }
 }
 
 - (ITTransientStatusWindowExitMode)exitMode
@@ -275,6 +250,16 @@ static ITTransientStatusWindow *staticWindow = nil;
     _horizontalPosition = newPosition;
 }
 
+- (float)effectProgress
+{
+    return _effectProgress;
+}
+
+- (void)setEffectProgress:(float)newProgress
+{
+    _effectProgress = newProgress;
+}
+
 - (float)screenPadding
 {
     return _screenPadding;
@@ -343,7 +328,8 @@ static ITTransientStatusWindow *staticWindow = nil;
 
 - (void)startVanishTimer
 {
-
+    // start timer, if appropriate
+    // if timer already exists, restart it.
 }
 
 @end