Changeset 14275

Timestamp:

12/02/2005 01:22:08 AM (3 years ago)

Author:

boredzo

Message:

Forgot to merge -arrowPathInSize:pointingDown:. Oops. Fixes #2300 (again).

Files:

• branches/adium-0.8/Frameworks/Adium Framework/ESFileTransfer.m (modified) (2 diffs)

branches/adium-0.8/Frameworks/Adium Framework/ESFileTransfer.m

@@ -256 +256 @@
-}
-
+- (NSBezierPath *)arrowPathInSize:(NSSize)arrowSize pointingDown:(BOOL)pointItDown
+{
+        if(!arrowPath) {
+                arrowPath = [[NSBezierPath bezierPath] retain];
+
+                /*   5
+                 *  / \ 
+                 * /   \    1-7 = points
+                 *6-7 3-4   the point of the triangle is 100% from the bottom.
+                 *    |     the back edge of the triangle is 50% from the bottom.
+                 *  1-2
+                 */
+
+#               define ONE_THIRD  (1.0/3.0)
+#               define TWO_THIRDS (2.0/3.0)
+#               define ONE_HALF    0.5
+
+                //start with the bottom vertex.
+                [arrowPath moveToPoint:NSMakePoint(ONE_THIRD,  0.0)]; //1
+                [arrowPath lineToPoint:NSMakePoint(TWO_THIRDS,  0.0)]; //2
+                //up to the inner right corner.
+                [arrowPath relativeLineToPoint:NSMakePoint(0.0, ONE_HALF)]; //3
+                //far right.
+                [arrowPath relativeLineToPoint:NSMakePoint(ONE_THIRD,  0.0)]; //4
+                //top center - the point of the arrow.
+                [arrowPath lineToPoint:NSMakePoint(ONE_HALF,  1.0)]; //5
+                //far left.
+                [arrowPath lineToPoint:NSMakePoint(0.0,  ONE_HALF)]; //6
+                //inner left corner.
+                [arrowPath relativeLineToPoint:NSMakePoint(ONE_THIRD,  0.0)]; //7
+                //to the finish line! yay!
+                [arrowPath closePath];
+        }
+
+        NSBezierPath *path = [arrowPath copy];
+
+        NSAffineTransform *transform = [NSAffineTransform transform];
+
+        if(pointItDown) {
+                //http://developer.apple.com/documentation/Carbon/Conceptual/QuickDrawToQuartz2D/tq_other/chapter_3_section_2.html
+                [transform translateXBy:0.0 yBy:1.0];
+                [transform     scaleXBy:1.0 yBy:-1.0];
+
+                [path transformUsingAffineTransform:transform]; 
+
+                transform = [NSAffineTransform transform];
+        }
+
+        [transform scaleXBy:arrowSize.width yBy:arrowSize.height];
+
+        [path transformUsingAffineTransform:transform];
+
+        return [path autorelease];      
+}
+
-- (NSImage *)iconImage
-{
@@ -268 +323 @@
-        if (extension && [extension length]) {          
-                NSImage         *systemIcon = [[NSWorkspace sharedWorkspace] iconForFileType:extension];
-                NSFont          *appleGothicFont = [NSFont fontWithName:@"AppleGothic" size:24];
-
-                BOOL pointingDown = (type == Incoming_FileTransfer);