Changeset 14837

Timestamp:

01/08/2006 07:44:24 PM (3 years ago)

Author:

boredzo

Message:

Got the arrow drawing correctly in both directions. Fixes #2300.

Files:

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

trunk/Frameworks/Adium Framework/ESFileTransfer.m

@@ -21 +21 @@
-static NSBezierPath *arrowPath = nil;
-
+#define MAGIC_ARROW_SCALE       0.85
+#define MAGIC_ARROW_TRANSLATE_X 2.85
+#define MAGIC_ARROW_TRANSLATE_Y 0.75
+
-@implementation ESFileTransfer
-//Init
@@ -268 +272 @@
-}
-
-
+ shaftLengthMultiplier:(float)shaftLengthMulti
-{
-        if(!arrowPath) {
@@ -284 +288 @@
-#               define TWO_THIRDS (2.0/3.0)
-#               define ONE_HALF    0.5
+                const float shaftLength = ONE_HALF * shaftLengthMulti;
+                const float shaftEndY = -(shaftLength - ONE_HALF); //the end of the arrow shaft (points 1-2).
-
-                //start with the bottom vertex.
-0.0
- 0.0
+shaftEndY
+shaftEndY
-                //up to the inner right corner.
-ONE_HALF
+shaftLength
-                //far right.
-                [arrowPath relativeLineToPoint:NSMakePoint(ONE_THIRD,  0.0)]; //4
@@ -323 +329 @@
-}
-
+- (NSBezierPath *)arrowPathInSize:(NSSize)arrowSize pointingDown:(BOOL)pointItDown
+{
+        return [self arrowPathInSize:arrowSize pointingDown:pointItDown shaftLengthMultiplier:1.0f];
+}
+
-- (NSImage *)iconImage
-{
@@ -368 +379 @@
-                //and the arrow on top of it.
-                if(drawArrow) {
-
+ shaftLengthMultiplier:5.0f
-
-                        //bring it into position.
@@ -375 +386 @@
-                        [arrow transformUsingAffineTransform:transform];
-
-
+
+
+
+
+
+
+
+
+
+
+
-                        [[NSColor alternateSelectedControlColor] setFill];
-                        [arrow fill];