git.ithinksw.org
/
ITKit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Getting things in order for the bigger stuff...
[ITKit.git]
/
ITTransientStatusWindow.m
diff --git
a/ITTransientStatusWindow.m
b/ITTransientStatusWindow.m
index
bae7b53
..
92eba65
100755
(executable)
--- a/
ITTransientStatusWindow.m
+++ b/
ITTransientStatusWindow.m
@@
-1,6
+1,6
@@
#import "ITTransientStatusWindow.h"
#import "ITWindowEffect.h"
#import "ITTransientStatusWindow.h"
#import "ITWindowEffect.h"
-#import <
CoreGraphics/CoreGraphic
s.h>
+#import <
ApplicationServices/ApplicationService
s.h>
#import "ITCoreGraphicsHacks.h"
#import "ITTextField.h"
#import "ITGrayRoundedView.h"
#import "ITCoreGraphicsHacks.h"
#import "ITTextField.h"
#import "ITGrayRoundedView.h"
@@
-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
{