From: Matthew Judy <mjudy@ithinksw.com>
Date: Wed, 1 Oct 2003 15:39:31 +0000 (+0000)
Subject: Adding quick fix get-the-fuck-out-of-the-way positioning
X-Git-Tag: v0.1~27
X-Git-Url: http://git.ithinksw.org/ITKit.git/commitdiff_plain/bd40b798b6a46cfecdfb128e2992bba254148911

Adding quick fix get-the-fuck-out-of-the-way positioning
---

diff --git a/ITButton.m b/ITButton.m
index f5d15b2..7a81312 100755
--- a/ITButton.m
+++ b/ITButton.m
@@ -23,15 +23,15 @@
 }
 
 - (void)displayIfNeeded {
-    [self displayIfNeededIgnoringOpacity];
+    [super displayIfNeededIgnoringOpacity];
 }
 
 - (void)displayIfNeededInRect:(NSRect)aRect {
-    [self displayIfNeededInRectIgnoringOpacity:aRect];
+    [super displayIfNeededInRectIgnoringOpacity:aRect];
 }
 
 - (void)displayRect:(NSRect)aRect {
-    [self displayRectIgnoringOpacity:aRect];
+    [super displayRectIgnoringOpacity:aRect];
 }
 
 - (id)initWithCoder:(NSCoder *)coder
diff --git a/ITButtonCell.m b/ITButtonCell.m
index 938e571..0f60271 100755
--- 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) );
-    float         alpha  = 0.35;
+    float         alpha  = 0.45;
     
     [path moveToPoint:pointA];
     [path lineToPoint:pointB];
@@ -84,10 +84,10 @@
                                    endAngle:270.0];
 
     if ( [self isHighlighted] ) {
-        alpha = 0.50;
+        alpha = 0.60;
     }
     
-    [[NSColor colorWithCalibratedWhite:0.0 alpha:alpha] set];
+    [[NSColor colorWithCalibratedWhite:0.15 alpha:alpha] set];
     [path fill];
 }
 
diff --git a/ITPivotWindowEffect.m b/ITPivotWindowEffect.m
index 25e21d4..81a4b5c 100755
--- a/ITPivotWindowEffect.m
+++ b/ITPivotWindowEffect.m
@@ -169,14 +169,14 @@
     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],
-                          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
--- a/ITSlideHorizontallyWindowEffect.m
+++ b/ITSlideHorizontallyWindowEffect.m
@@ -156,8 +156,8 @@
 
 - (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],
diff --git a/ITSlideVerticallyWindowEffect.m b/ITSlideVerticallyWindowEffect.m
index d5b1b6f..389583f 100755
--- a/ITSlideVerticallyWindowEffect.m
+++ b/ITSlideVerticallyWindowEffect.m
@@ -156,8 +156,8 @@
 
 - (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],
diff --git a/Showcase/English.lproj/MainMenu.nib/keyedobjects.nib b/Showcase/English.lproj/MainMenu.nib/keyedobjects.nib
index 5ad95ee..f767f1b 100755
Binary files a/Showcase/English.lproj/MainMenu.nib/keyedobjects.nib and b/Showcase/English.lproj/MainMenu.nib/keyedobjects.nib differ