Changeset 3739

Timestamp:

Nov 7, 2007, 12:09:36 AM (15 years ago)

Author:

livings124

Message:

update status bar to use the same gradient as the filter bar, and remove the corresponding images

Location:

trunk/macosx

Files:

• FilterBarView.m (modified) (2 diffs)
• ImageBackgroundView.m (modified) (1 diff)
• Images/FilterBarBackground.png (deleted)
• Images/StatusBarBackground.png (deleted)
• StatusBarView.h (modified) (1 diff)
• StatusBarView.m (modified) (2 diffs)

trunk/macosx/FilterBarView.m

@@ -26 +26 @@
 #import "CTGradient.h"
 
+#warning combine
+
 @implementation FilterBarView
 
@@ -42 +44 @@
 - (void) drawRect: (NSRect) rect
 {
-    NSRect bounds = [self bounds];
     [fGradient fillRect: rect angle: 90];
 }

trunk/macosx/ImageBackgroundView.m

@@ -22 +22 @@
  * DEALINGS IN THE SOFTWARE.
  *****************************************************************************/
+
+#warning class needed?
 
 #import "ImageBackgroundView.h"

trunk/macosx/StatusBarView.h

@@ -24 +24 @@
 
 #import <Cocoa/Cocoa.h>
-#import "ImageBackgroundView.h"
 
-@interface StatusBarView : ImageBackgroundView
+@class CTGradient;
+
+@interface StatusBarView : NSView
 {
+    CTGradient * fGradient;
 }
+
 @end

trunk/macosx/StatusBarView.m

@@ -24 +24 @@
 
 #import "StatusBarView.h"
+#import "CTGradient.h"
+
+#warning combine
 
 @implementation StatusBarView
@@ -29 +32 @@
 - (void) awakeFromNib
 {
-    [self setBackgroundImage: [NSImage imageNamed: @"StatusBarBackground.png"]];
+    NSColor * beginningColor = [NSColor colorWithCalibratedRed: 208.0/255.0 green: 208.0/255.0 blue: 208.0/255.0 alpha: 1.0];
+    NSColor * endingColor = [NSColor colorWithCalibratedRed: 233.0/255.0 green: 233.0/255.0 blue: 233.0/255.0 alpha: 1.0];
+    fGradient = [[CTGradient gradientWithBeginningColor: beginningColor endingColor: endingColor] retain];
 }
 
 - (BOOL) isOpaque
 {
-    return [[self window] isMainWindow];
+    return YES;
 }
 
 - (void) drawRect: (NSRect) rect
 {
-    if ([[self window] isMainWindow])
-        [super drawRect: rect];
+    [fGradient fillRect: rect angle: 90];
 }