Changeset 14254

Timestamp:

11/30/2005 07:50:25 PM (3 years ago)

Author:

boredzo

Message:

We no longer use AppleGothic to draw the arrow badges on icons in the File Transfers window. Instead, we draw the arrow ourselves. Fixes #2300.

Files:

• trunk/Frameworks/Adium Framework/ESFileTransfer.m (modified) (6 diffs)

trunk/Frameworks/Adium Framework/ESFileTransfer.m

@@ -19 +19 @@
-#import "ESFileTransfer.h"
-
-
-
-
-
+
-
-@implementation ESFileTransfer
@@ -271 +268 @@
-}
-
+- (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
+                NSLog(@"arrow bounds (before): %@", NSStringFromRect([path bounds]));
+                [transform translateXBy:0.0 yBy:1.0];
+                [transform     scaleXBy:1.0 yBy:-1.0];
+
+                [path transformUsingAffineTransform:transform]; 
+
+                NSLog(@"arrow bounds (after transform): %@", NSStringFromRect([path bounds]));
+
+                transform = [NSAffineTransform transform];
+        }
+
+        NSLog(@"arrowSize: %@", NSStringFromSize(arrowSize));
+        [transform scaleXBy:arrowSize.width yBy:arrowSize.height];
+
+        [path transformUsingAffineTransform:transform];
+
+        return [path autorelease];      
+}
+
-- (NSImage *)iconImage
-{
@@ -283 +339 @@
-        if (extension && [extension length]) {          
-                NSImage         *systemIcon = [[NSWorkspace sharedWorkspace] iconForFileType:extension];
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-                // If type is Incoming (*down*load) or Outgoing (*up*load), overlay an arrow in a circle.
-                iconImage = [[NSImage alloc] initWithSize:[systemIcon size]];
@@ -310 +352 @@
-                                                                                 (NSHeight(rect)/2.0));         
-
-                NSMutableDictionary *atts = [(NSMutableDictionary *)[[NSDictionary dictionaryWithObjectsAndKeys:
-                        [NSColor alternateSelectedControlColor], NSForegroundColorAttributeName,
-                        appleGothicFont, NSFontAttributeName, // AppleGothic has our arrow glyphs
-                        nil] mutableCopy] autorelease];
-                
-                NSSize arrowSize = [badgeArrow sizeWithAttributes:atts];
-                while (arrowSize.height > NSHeight(bottomRight)*0.9) { // shrink arrow to fit
-                        NSFont *tempFont = (NSFont *)[atts objectForKey:NSFontAttributeName];
-                        [atts setObject:[NSFont fontWithName:[tempFont fontName] size:[tempFont pointSize]*0.99] forKey:NSFontAttributeName];
-                        arrowSize = [badgeArrow sizeWithAttributes:atts];
-                }
-                
-                [iconImage lockFocus];
-                
-MakePoint(0.0,0.0)
+ZeroPoint
-                
-                float line = ((NSWidth(bottomRight) / 15) + ((NSHeight(bottomRight) / 15) / 2));
@@ -332 +362 @@
-                                                                                NSHeight(bottomRight) - (line));
-
+                //draw our circle background...
-                NSBezierPath *circle = [NSBezierPath bezierPathWithOvalInRect:circleRect];
-                [circle setLineWidth:line];
@@ -338 +369 @@
-                [circle fill];
-                [circle stroke];
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                
-                [iconImage unlockFocus];