Forgot to cancel the vanish timer if an ITTSW consumer manually vanishes a window...

[ITKit.git] / ITTransientStatusWindow.m

diff --git a/ITTransientStatusWindow.m b/ITTransientStatusWindow.m
index f2ed917..6eedb93 100755 (executable)
--- a/ITTransientStatusWindow.m
+++ b/ITTransientStatusWindow.m
@@ -19,6 +19,7 @@
            backgroundType:(ITTransientStatusWindowBackgroundType)backgroundType;
 - (void)rebuildWindow;
 - (void)startVanishTimer;
+- (void)stopVanishTimer;
 @end
 
 
@@ -73,7 +74,7 @@ static ITTransientStatusWindow *staticWindow = nil;
                                      backing:NSBackingStoreBuffered
                                        defer:NO] ) ) {
                                     
-        _visibilityState     = ITTransientStatusWindowHiddenState;
+        _visibilityState     = ITWindowHiddenState;
         _exitMode            = exitMode;
         _exitDelay           = DEFAULT_EXIT_DELAY;
         _backgroundType      = backgroundType;
@@ -84,7 +85,7 @@ static ITTransientStatusWindow *staticWindow = nil;
         _entryEffect         = nil;
         _exitEffect          = nil;
         _reallyIgnoresEvents = YES;
-        _delayTimer          = nil;
+        _exitTimer           = nil;
 
 //      if ( _backgroundType == ITTransientStatusWindowRounded ) {
 //          _contentSubView = contentView;
@@ -152,62 +153,33 @@ static ITTransientStatusWindow *staticWindow = nil;
 
 */
 
- - (IBAction)appear:(id)sender
- {
-    NSLog(@"%i", _visibilityState);
-    if ( _visibilityState == ITTransientStatusWindowHiddenState ) {
+- (IBAction)appear:(id)sender
+{
+    if ( _visibilityState == ITWindowHiddenState ) {
          // 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];
-    } else if ( _visibilityState == ITTransientStatusWindowVisibleState ) {
+        [_entryEffect performAppear];
+    } else if ( _visibilityState == ITWindowVisibleState ) {
          // Window is completely visible.  Simply reset the timer.
         [self startVanishTimer];
-    } else if ( _visibilityState == ITTransientStatusWindowAppearingState ) {
-         // Window is appearing.  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];
+    } else if ( _visibilityState == ITWindowAppearingState ) {
+         // Window is on its way in.  Do nothing.
+    } else if ( _visibilityState == ITWindowVanishingState ) {
+        // Window is on its way out.  Cancel the vanish.
+        [_exitEffect cancelVanish];
     }
- }
+}
 
 - (IBAction)vanish:(id)sender
 {
-    if ( _visibilityState == ITTransientStatusWindowVisibleState ) {
+    if ( _visibilityState == ITWindowVisibleState ) {
         // 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];
-    } else if ( _visibilityState == ITTransientStatusWindowHiddenState ) {
+        [_exitEffect performVanish];
+    } else if ( _visibilityState == ITWindowHiddenState ) {
         // Window is hidden.  Do nothing.
-    } else if ( _visibilityState == ITTransientStatusWindowAppearingState ) {
+    } else if ( _visibilityState == ITWindowAppearingState ) {
         // Window is on its way in.  Cancel appear.
         [_entryEffect cancelAppear];
-        _visibilityState = ITTransientStatusWindowHiddenState;
-    } else if ( _visibilityState == ITTransientStatusWindowVanishingState ) {
+    } else if ( _visibilityState == ITWindowVanishingState ) {
         // Window is on its way out.  Do nothing.
     }
 }
@@ -220,6 +192,12 @@ static ITTransientStatusWindow *staticWindow = nil;
 - (void)setVisibilityState:(ITWindowVisibilityState)newState
 {
     _visibilityState = newState;
+    
+    if ( _visibilityState == ITWindowVisibleState ) {
+        [self startVanishTimer];
+    } else if ( (_visibilityState == ITWindowVanishingState) || (_visibilityState == ITWindowHiddenState) ) {
+        [self stopVanishTimer];
+    }
 }
 
 - (ITTransientStatusWindowExitMode)exitMode
@@ -230,6 +208,14 @@ static ITTransientStatusWindow *staticWindow = nil;
 - (void)setExitMode:(ITTransientStatusWindowExitMode)newMode
 {
     _exitMode = newMode;
+    
+    if ( _visibilityState == ITWindowVisibleState ) {
+        if ( _exitMode == ITTransientStatusWindowExitOnCommand ) {
+            [self stopVanishTimer];
+        } else if ( _exitMode == ITTransientStatusWindowExitAfterDelay ) {
+            [self startVanishTimer];
+        }
+    }
 }
 
 - (float)exitDelay
@@ -275,6 +261,16 @@ static ITTransientStatusWindow *staticWindow = nil;
     _horizontalPosition = newPosition;
 }
 
+- (float)effectProgress
+{
+    return _effectProgress;
+}
+
+- (void)setEffectProgress:(float)newProgress
+{
+    _effectProgress = newProgress;
+}
+
 - (float)screenPadding
 {
     return _screenPadding;
@@ -302,7 +298,7 @@ static ITTransientStatusWindow *staticWindow = nil;
 
 - (void)setEntryEffect:(ITWindowEffect *)newEffect
 {
-    [_entryEffect autorelease];
+    [_entryEffect releaseWhenIdle];
     _entryEffect = [newEffect retain];
 }
 
@@ -313,7 +309,7 @@ static ITTransientStatusWindow *staticWindow = nil;
 
 - (void)setExitEffect:(ITWindowEffect *)newEffect
 {
-    [_exitEffect autorelease];
+    [_exitEffect releaseWhenIdle];
     _exitEffect = [newEffect retain];
 }
 
@@ -343,7 +339,28 @@ static ITTransientStatusWindow *staticWindow = nil;
 
 - (void)startVanishTimer
 {
+    if ( _exitMode == ITTransientStatusWindowExitAfterDelay) {
+        [self stopVanishTimer];
+        _exitTimer = [NSTimer scheduledTimerWithTimeInterval:_exitDelay
+                                                      target:self
+                                                    selector:@selector(doDelayedExit)
+                                                    userInfo:nil
+                                                     repeats:NO];
+    }
+}
+
+- (void)doDelayedExit
+{
+    [self vanish:self];
+    _exitTimer = nil;
+}
 
+- (void)stopVanishTimer
+{
+    if ( _exitTimer ) {
+        [_exitTimer invalidate];
+        _exitTimer = nil;
+    }
 }
 
 @end