git.ithinksw.org
/
ITKit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Checking in new window effect frame, so I can begin moving the guts into it. Also...
[ITKit.git]
/
ITTransientStatusWindow.m
diff --git
a/ITTransientStatusWindow.m
b/ITTransientStatusWindow.m
index
ed587ff
..
004396a
100755
(executable)
--- a/
ITTransientStatusWindow.m
+++ b/
ITTransientStatusWindow.m
@@
-76,7
+76,7
@@
static ITTransientStatusWindow *staticWindow = nil;
{
NSRect contentRect;
{
NSRect contentRect;
- // If no Content View was provided, use a generic
NSView with the app icon
.
+ // If no Content View was provided, use a generic
view
.
if ( ! (contentView) ) {
contentView = [[[NSView alloc] initWithFrame:
NSMakeRect(100.0, 100.0, 200.0, 200.0)] autorelease];
if ( ! (contentView) ) {
contentView = [[[NSView alloc] initWithFrame:
NSMakeRect(100.0, 100.0, 200.0, 200.0)] autorelease];
@@
-96,8
+96,8
@@
static ITTransientStatusWindow *staticWindow = nil;
_backgroundType = backgroundType;
_verticalPosition = ITTransientStatusWindowPositionBottom;
_horizontalPosition = ITTransientStatusWindowPositionLeft;
_backgroundType = backgroundType;
_verticalPosition = ITTransientStatusWindowPositionBottom;
_horizontalPosition = ITTransientStatusWindowPositionLeft;
-
// _entryEffect = ITTransientStatusWindowEffectNone
;
- _entryEffect = ITTransientStatusWindowEffect
Pivot
;
+
_screenPadding = 32.0
;
+ _entryEffect = ITTransientStatusWindowEffect
None
;
_exitEffect = ITTransientStatusWindowEffectDissolve;
_effectTime = DEFAULT_EFFECT_TIME;
_effectProgress = 0.00;
_exitEffect = ITTransientStatusWindowEffectDissolve;
_effectTime = DEFAULT_EFFECT_TIME;
_effectProgress = 0.00;
@@
-105,11
+105,11
@@
static ITTransientStatusWindow *staticWindow = nil;
_delayTimer = nil;
_effectTimer = nil;
_delayTimer = nil;
_effectTimer = nil;
-//
if ( _backgroundType == ITTransientStatusWindowRounded ) {
-//
_contentSubView = contentView;
-//
} else {
-//
[self setContentView:contentView];
-//
}
+// if ( _backgroundType == ITTransientStatusWindowRounded ) {
+// _contentSubView = contentView;
+// } else {
+// [self setContentView:contentView];
+// }
[self setIgnoresMouseEvents:YES];
[self setLevel:NSScreenSaverWindowLevel];
[self setIgnoresMouseEvents:YES];
[self setLevel:NSScreenSaverWindowLevel];
@@
-271,24
+271,26
@@
static ITTransientStatusWindow *staticWindow = nil;
_horizontalPosition = newPosition;
}
_horizontalPosition = newPosition;
}
-- (IT
TransientStatusWindowEffect
)entryEffect
+- (IT
WindowEffect *
)entryEffect
{
return _entryEffect;
}
{
return _entryEffect;
}
-- (void)setEntryEffect:(IT
TransientStatusWindowEffect)newEffect;
+- (void)setEntryEffect:(IT
WindowEffect *)newEffect
{
{
- _entryEffect = newEffect;
+ [_entryEffect autorelease];
+ _entryEffect = [newEffect retain];
}
}
-- (IT
TransientStatusWindowEffect)exitEffect;
+- (IT
WindowEffect *)exitEffect
{
return _exitEffect;
}
{
return _exitEffect;
}
-- (void)setExitEffect:(IT
TransientStatusWindowEffect)newEffect;
+- (void)setExitEffect:(IT
WindowEffect *)newEffect
{
{
- _exitEffect = newEffect;
+ [_exitEffect autorelease];
+ _exitEffect = [newEffect retain];
}
}
@@
-421,8
+423,11
@@
static ITTransientStatusWindow *staticWindow = nil;
{
float degAngle = (angle * (pi / 180));
CGAffineTransform transform = CGAffineTransformMakeRotation(degAngle);
{
float degAngle = (angle * (pi / 180));
CGAffineTransform transform = CGAffineTransformMakeRotation(degAngle);
+
+ // Set pivot point
transform.tx = -32.0;
transform.ty = [self frame].size.height + 32.0;
transform.tx = -32.0;
transform.ty = [self frame].size.height + 32.0;
+
CGSSetWindowTransform([NSApp contextID],
(CGSWindowID)[self windowNumber],
CGAffineTransformTranslate(transform,
CGSSetWindowTransform([NSApp contextID],
(CGSWindowID)[self windowNumber],
CGAffineTransformTranslate(transform,