git.ithinksw.org
/
ITKit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4017215
)
Adding quick fix get-the-fuck-out-of-the-way positioning
author
Matthew Judy
<mjudy@ithinksw.com>
Wed, 1 Oct 2003 15:39:31 +0000
(15:39 +0000)
committer
Matthew Judy
<mjudy@ithinksw.com>
Wed, 1 Oct 2003 15:39:31 +0000
(15:39 +0000)
ITButton.m
patch
|
blob
|
history
ITButtonCell.m
patch
|
blob
|
history
ITPivotWindowEffect.m
patch
|
blob
|
history
ITSlideHorizontallyWindowEffect.m
patch
|
blob
|
history
ITSlideVerticallyWindowEffect.m
patch
|
blob
|
history
Showcase/English.lproj/MainMenu.nib/keyedobjects.nib
patch
|
blob
|
history
diff --git
a/ITButton.m
b/ITButton.m
index
f5d15b2
..
7a81312
100755
(executable)
--- a/
ITButton.m
+++ b/
ITButton.m
@@
-23,15
+23,15
@@
}
- (void)displayIfNeeded {
}
- (void)displayIfNeeded {
- [s
elf
displayIfNeededIgnoringOpacity];
+ [s
uper
displayIfNeededIgnoringOpacity];
}
- (void)displayIfNeededInRect:(NSRect)aRect {
}
- (void)displayIfNeededInRect:(NSRect)aRect {
- [s
elf
displayIfNeededInRectIgnoringOpacity:aRect];
+ [s
uper
displayIfNeededInRectIgnoringOpacity:aRect];
}
- (void)displayRect:(NSRect)aRect {
}
- (void)displayRect:(NSRect)aRect {
- [s
elf
displayRectIgnoringOpacity:aRect];
+ [s
uper
displayRectIgnoringOpacity:aRect];
}
- (id)initWithCoder:(NSCoder *)coder
}
- (id)initWithCoder:(NSCoder *)coder
diff --git
a/ITButtonCell.m
b/ITButtonCell.m
index
938e571
..
0f60271
100755
(executable)
--- a/
ITButtonCell.m
+++ b/
ITButtonCell.m
@@
-69,7
+69,7
@@
NSPoint pointD = NSMakePoint( (ch / 2) , ch );
NSPoint lCtr = NSMakePoint( (ch / 2) , (ch / 2) );
NSPoint rCtr = NSMakePoint( (cw - (ch / 2)) , (ch / 2) );
NSPoint pointD = NSMakePoint( (ch / 2) , ch );
NSPoint lCtr = NSMakePoint( (ch / 2) , (ch / 2) );
NSPoint rCtr = NSMakePoint( (cw - (ch / 2)) , (ch / 2) );
- float alpha = 0.
3
5;
+ float alpha = 0.
4
5;
[path moveToPoint:pointA];
[path lineToPoint:pointB];
[path moveToPoint:pointA];
[path lineToPoint:pointB];
@@
-84,10
+84,10
@@
endAngle:270.0];
if ( [self isHighlighted] ) {
endAngle:270.0];
if ( [self isHighlighted] ) {
- alpha = 0.
5
0;
+ alpha = 0.
6
0;
}
}
- [[NSColor colorWithCalibratedWhite:0.
0
alpha:alpha] set];
+ [[NSColor colorWithCalibratedWhite:0.
15
alpha:alpha] set];
[path fill];
}
[path fill];
}
diff --git
a/ITPivotWindowEffect.m
b/ITPivotWindowEffect.m
index
25e21d4
..
81a4b5c
100755
(executable)
--- a/
ITPivotWindowEffect.m
+++ b/
ITPivotWindowEffect.m
@@
-169,14
+169,14
@@
CGAffineTransform transform = CGAffineTransformMakeRotation(degAngle);
// Set pivot rotation point
CGAffineTransform transform = CGAffineTransformMakeRotation(degAngle);
// Set pivot rotation point
- transform.tx = -
32.0
;
- transform.ty =
[_window frame].size.height + 32.0
;
+ transform.tx = -
( 32.0 + [[_window screen] visibleFrame].origin.x )
;
+ transform.ty =
( [_window frame].size.height + 32.0 + [[_window screen] visibleFrame].origin.y )
;
CGSSetWindowTransform([NSApp contextID],
(CGSWindowID)[_window windowNumber],
CGSSetWindowTransform([NSApp contextID],
(CGSWindowID)[_window windowNumber],
- CGAffineTransformTranslate(transform,
-
(([_window frame].origin.x - 32.0) * -1
),
-
(([[_window screen] frame].size.height - ([_window frame].origin.y) + 32.0) * -1) )
);
+ CGAffineTransformTranslate(
transform,
+
-( [_window frame].origin.x - (32.0 + [[_window screen] visibleFrame].origin.x)
),
+
-( [[_window screen] frame].size.height - ([_window frame].origin.y) + 32.0 + [[_window screen] visibleFrame].origin.y) )
);
}
}
diff --git
a/ITSlideHorizontallyWindowEffect.m
b/ITSlideHorizontallyWindowEffect.m
index
01b3545
..
e3a683c
100755
(executable)
--- a/
ITSlideHorizontallyWindowEffect.m
+++ b/
ITSlideHorizontallyWindowEffect.m
@@
-156,8
+156,8
@@
- (void)setSlide:(float)distance
{
- (void)setSlide:(float)distance
{
- CGAffineTransform transform = CGAffineTransformMakeTranslation((distance -
32.0
),
- -( [[_window screen] frame].size.height - ( [_window frame].size.height + 32.0) ) );
+ CGAffineTransform transform = CGAffineTransformMakeTranslation((distance -
(32.0 + [[_window screen] visibleFrame].origin.x)
),
+ -( [[_window screen] frame].size.height - ( [_window frame].size.height + 32.0
+ [[_window screen] visibleFrame].origin.y
) ) );
CGSSetWindowTransform([NSApp contextID],
(CGSWindowID)[_window windowNumber],
CGSSetWindowTransform([NSApp contextID],
(CGSWindowID)[_window windowNumber],
diff --git
a/ITSlideVerticallyWindowEffect.m
b/ITSlideVerticallyWindowEffect.m
index
d5b1b6f
..
389583f
100755
(executable)
--- a/
ITSlideVerticallyWindowEffect.m
+++ b/
ITSlideVerticallyWindowEffect.m
@@
-156,8
+156,8
@@
- (void)setSlide:(float)distance
{
- (void)setSlide:(float)distance
{
- CGAffineTransform transform = CGAffineTransformMakeTranslation( -
32.0
,
- -( [[_window screen] frame].size.height - ( distance + 32.0) ) );
+ CGAffineTransform transform = CGAffineTransformMakeTranslation( -
( 32.0 + [[_window screen] visibleFrame].origin.x )
,
+ -( [[_window screen] frame].size.height - ( distance + 32.0
+ [[_window screen] visibleFrame].origin.y
) ) );
CGSSetWindowTransform([NSApp contextID],
(CGSWindowID)[_window windowNumber],
CGSSetWindowTransform([NSApp contextID],
(CGSWindowID)[_window windowNumber],
diff --git
a/Showcase/English.lproj/MainMenu.nib/keyedobjects.nib
b/Showcase/English.lproj/MainMenu.nib/keyedobjects.nib
index
5ad95ee
..
f767f1b
100755
(executable)
Binary files a/Showcase/English.lproj/MainMenu.nib/keyedobjects.nib and b/Showcase/English.lproj/MainMenu.nib/keyedobjects.nib differ