From bd40b798b6a46cfecdfb128e2992bba254148911 Mon Sep 17 00:00:00 2001
From: Matthew Judy <mjudy@ithinksw.com>
Date: Wed, 1 Oct 2003 15:39:31 +0000
Subject: [PATCH] Adding quick fix get-the-fuck-out-of-the-way positioning

---
 ITButton.m                                    |   6 +++---
 ITButtonCell.m                                |   6 +++---
 ITPivotWindowEffect.m                         |  10 +++++-----
 ITSlideHorizontallyWindowEffect.m             |   4 ++--
 ITSlideVerticallyWindowEffect.m               |   4 ++--
 .../MainMenu.nib/keyedobjects.nib             | Bin 38840 -> 38850 bytes
 6 files changed, 15 insertions(+), 15 deletions(-)

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 5ad95ee32e3767450c96b82e4468d5488bdaf081..f767f1bb8577a370983bd4724558b05d04a734c9 100755
GIT binary patch
delta 7619
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
M{B`R)^0W^AA93nCDgXcg

delta 7690
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
OPyD~`{l>oS?f(M{(nl2l

-- 
2.20.1