git.ithinksw.org
/
ITKit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Whoops. Haha. :D Lemme just slip this fix in there.
[ITKit.git]
/
ITPivotWindowEffect.m
diff --git
a/ITPivotWindowEffect.m
b/ITPivotWindowEffect.m
index
95c1040
..
25e21d4
100755
(executable)
--- a/
ITPivotWindowEffect.m
+++ b/
ITPivotWindowEffect.m
@@
-24,7
+24,9
@@
- (void)performAppear
{
- (void)performAppear
{
- [self setWindowVisibility:ITTransientStatusWindowAppearingState];
+ __idle = NO;
+
+ [self setWindowVisibility:ITWindowAppearingState];
[self performAppearFromProgress:0.0 effectTime:_effectTime];
}
[self performAppearFromProgress:0.0 effectTime:_effectTime];
}
@@
-64,12
+66,18
@@
{
[_effectTimer invalidate];
_effectTimer = nil;
{
[_effectTimer invalidate];
_effectTimer = nil;
- [self setWindowVisibility:ITTransientStatusWindowVisibleState];
+ [self setWindowVisibility:ITWindowVisibleState];
+
+ __idle = YES;
+
+ if ( __shouldReleaseWhenIdle ) {
+ [self release];
+ }
}
- (void)cancelAppear
{
}
- (void)cancelAppear
{
- [self setWindowVisibility:IT
TransientStatus
WindowVanishingState];
+ [self setWindowVisibility:ITWindowVanishingState];
[_effectTimer invalidate];
_effectTimer = nil;
[_effectTimer invalidate];
_effectTimer = nil;
@@
-85,7
+93,9
@@
- (void)performVanish
{
- (void)performVanish
{
- [self setWindowVisibility:ITTransientStatusWindowVanishingState];
+ __idle = NO;
+
+ [self setWindowVisibility:ITWindowVanishingState];
[self performVanishFromProgress:1.0 effectTime:_effectTime];
}
[self performVanishFromProgress:1.0 effectTime:_effectTime];
}
@@
-126,12
+136,19
@@
_effectTimer = nil;
[_window orderOut:self];
[_window setAlphaValue:1.0];
_effectTimer = nil;
[_window orderOut:self];
[_window setAlphaValue:1.0];
- [self setWindowVisibility:ITTransientStatusWindowHiddenState];
+ [self setPivot:0.0];
+ [self setWindowVisibility:ITWindowHiddenState];
+
+ __idle = YES;
+
+ if ( __shouldReleaseWhenIdle ) {
+ [self release];
+ }
}
- (void)cancelVanish
{
}
- (void)cancelVanish
{
- [self setWindowVisibility:IT
TransientStatus
WindowAppearingState];
+ [self setWindowVisibility:ITWindowAppearingState];
[_effectTimer invalidate];
_effectTimer = nil;
[_effectTimer invalidate];
_effectTimer = nil;