Changeset 1312

Timestamp:

Jan 2, 2007, 7:51:02 PM (15 years ago)

Author:

livings124

Message:

streamline action button code

Location:

trunk

Files:

• Transmission.xcodeproj/project.pbxproj (modified) (4 diffs)
• macosx/ActionPopUpButton.h (modified) (1 diff)
• macosx/ActionPopUpButton.m (modified) (2 diffs)
• macosx/ActionPopUpButtonCell.h (deleted)
• macosx/ActionPopUpButtonCell.m (deleted)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -112 +112 @@
                 A24600520A6DCE6600D19088 /* SpeedLimitButtonGraphite.png in Resources */ = {isa = PBXBuildFile; fileRef = A24600500A6DCE6600D19088 /* SpeedLimitButtonGraphite.png */; };
                 A24999230B49F1B5001EADA3 /* ActionPopUpButton.m in Sources */ = {isa = PBXBuildFile; fileRef = A24999210B49F1B5001EADA3 /* ActionPopUpButton.m */; };
-                A24999440B49F5AD001EADA3 /* ActionPopUpButtonCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A24999420B49F5AD001EADA3 /* ActionPopUpButtonCell.m */; };
                 A24F19080A3A790800C9C145 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A24F19070A3A790800C9C145 /* Sparkle.framework */; };
                 A24F19210A3A796800C9C145 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = A24F19070A3A790800C9C145 /* Sparkle.framework */; };
@@ -314 +313 @@
                 A24999200B49F1B5001EADA3 /* ActionPopUpButton.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ActionPopUpButton.h; path = macosx/ActionPopUpButton.h; sourceTree = "<group>"; };
                 A24999210B49F1B5001EADA3 /* ActionPopUpButton.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ActionPopUpButton.m; path = macosx/ActionPopUpButton.m; sourceTree = "<group>"; };
-                A24999420B49F5AD001EADA3 /* ActionPopUpButtonCell.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ActionPopUpButtonCell.m; path = macosx/ActionPopUpButtonCell.m; sourceTree = "<group>"; };
-                A24999430B49F5AD001EADA3 /* ActionPopUpButtonCell.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ActionPopUpButtonCell.h; path = macosx/ActionPopUpButtonCell.h; sourceTree = "<group>"; };
                 A24F19070A3A790800C9C145 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = macosx/Sparkle.framework; sourceTree = "<group>"; };
                 A253F6F20A698970008EE24F /* FilterBarBackground.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FilterBarBackground.png; path = macosx/Images/FilterBarBackground.png; sourceTree = "<group>"; };
@@ -468 +465 @@
                                 A24999200B49F1B5001EADA3 /* ActionPopUpButton.h */,
                                 A24999210B49F1B5001EADA3 /* ActionPopUpButton.m */,
-                                A24999420B49F5AD001EADA3 /* ActionPopUpButtonCell.m */,
-                                A24999430B49F5AD001EADA3 /* ActionPopUpButtonCell.h */,
                         );
                         name = Sources;
@@ -935 +930 @@
                                 A2BF07910B066E0800757C92 /* SpeedLimitToTurtleIconTransformer.m in Sources */,
                                 A24999230B49F1B5001EADA3 /* ActionPopUpButton.m in Sources */,
-                                A24999440B49F5AD001EADA3 /* ActionPopUpButtonCell.m in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/macosx/ActionPopUpButton.h

@@ -5 +5 @@
 @interface ActionPopUpButton : NSPopUpButton
 {
+    NSImage * fImage, * fImagePressed;
 }
 @end

trunk/macosx/ActionPopUpButton.m

@@ -1 +1 @@
 #import "ActionPopUpButton.h"
-#import "ActionPopUpButtonCell.h"
 
 @implementation ActionPopUpButton
@@ -6 +5 @@
 - (id) initWithCoder: (NSCoder *) coder
 {
-        if (self = [super initWithCoder: coder])
+        if ((self = [super initWithCoder: coder]))
     {
-        [self setCell: [[ActionPopUpButtonCell alloc] initTextCell: @"" pullsDown: YES]];
+        fImage = [NSImage imageNamed: @"ActionButton.png"];
+        [fImage setFlipped: YES];
+        fImagePressed = [NSImage imageNamed: @"ActionButtonPressed.png"];
+        [fImagePressed setFlipped: YES];
         }
         return self;
 }
 
+- (void) drawRect: (NSRect) rect
+{
+    NSImage * image = [[self cell] isHighlighted] ? fImagePressed : fImage;
+        [image drawInRect: rect fromRect: NSMakeRect(0.0, 0.0, [image size].width, [image size].height)
+            operation: NSCompositeSourceOver fraction: 1.0];
+}
+
 @end