Positioning changes are now reflected properly by the prefs. When changing positions...

[ITKit.git] / ITTransientStatusWindow.m

diff --git a/ITTransientStatusWindow.m b/ITTransientStatusWindow.m
index bae7b53..c47f9af 100755 (executable)
--- a/ITTransientStatusWindow.m
+++ b/ITTransientStatusWindow.m
@@ -1,9 +1,9 @@
 #import "ITTransientStatusWindow.h"
 #import "ITWindowEffect.h"
 #import "ITTransientStatusWindow.h"
 #import "ITWindowEffect.h"

-#import <CoreGraphics/CoreGraphics.h>
+#import <ApplicationServices/ApplicationServices.h>

 #import "ITCoreGraphicsHacks.h"
 #import "ITTextField.h"
 #import "ITCoreGraphicsHacks.h"
 #import "ITTextField.h"

-#import "ITGrayRoundedView.h"
+#import "ITTSWBackgroundView.h"

 
 #define EFFECT_FPS 30.0
 
 
 #define EFFECT_FPS 30.0
 


@@ -81,7 +81,7 @@ static ITTransientStatusWindow *staticWindow = nil;
         _verticalPosition    = ITWindowPositionBottom;
         _horizontalPosition  = ITWindowPositionLeft;
         _screenPadding       = 32.0;
         _verticalPosition    = ITWindowPositionBottom;
         _horizontalPosition  = ITWindowPositionLeft;
         _screenPadding       = 32.0;

-        _screenNumber        = 0;
+        //_screenNumber        = 0;

         _entryEffect         = nil;
         _exitEffect          = nil;
         _reallyIgnoresEvents = YES;
         _entryEffect         = nil;
         _exitEffect          = nil;
         _reallyIgnoresEvents = YES;


@@ -195,6 +195,8 @@ static ITTransientStatusWindow *staticWindow = nil;
     
     if ( _visibilityState == ITWindowVisibleState ) {
         [self startVanishTimer];
     
     if ( _visibilityState == ITWindowVisibleState ) {
         [self startVanishTimer];

+    } else if ( (_visibilityState == ITWindowVanishingState) || (_visibilityState == ITWindowHiddenState) ) {
+        [self stopVanishTimer];

     }
 }
 
     }
 }
 


@@ -279,7 +281,7 @@ static ITTransientStatusWindow *staticWindow = nil;
     _screenPadding = newPadding;
 }
 
     _screenPadding = newPadding;
 }
 

-- (int)screenNumber
+/*- (int)screenNumber

 {
     return _screenNumber;
 }
 {
     return _screenNumber;
 }


@@ -287,7 +289,7 @@ static ITTransientStatusWindow *staticWindow = nil;
 - (void)setScreenNumber:(int)newNumber
 {
     _screenNumber = newNumber;
 - (void)setScreenNumber:(int)newNumber
 {
     _screenNumber = newNumber;

-}
+}*/

 
 - (ITWindowEffect *)entryEffect
 {
 
 - (ITWindowEffect *)entryEffect
 {


@@ -320,7 +322,7 @@ static ITTransientStatusWindow *staticWindow = nil;
 - (void)rebuildWindow;
 {
     if ( _backgroundType == ITTransientStatusWindowRounded ) {
 - (void)rebuildWindow;
 {
     if ( _backgroundType == ITTransientStatusWindowRounded ) {

-        ITGrayRoundedView *roundedView = [[[ITGrayRoundedView alloc] initWithFrame:[self frame]] autorelease];
+        ITTSWBackgroundView *roundedView = [[[ITTSWBackgroundView alloc] initWithFrame:[self frame]] autorelease];

 
         [self setBackgroundColor:[NSColor clearColor]];
         [self setHasShadow:NO];
 
         [self setBackgroundColor:[NSColor clearColor]];
         [self setHasShadow:NO];