Changeset 4077

Timestamp:

Dec 6, 2007, 12:57:10 AM (15 years ago)

Author:

livings124

Message:

make status bar filled only on 10.5 and greater; use NSGradient instead of CTGradient (since 10.4 support isn't needed for this)

Location:

trunk/macosx

Files:

• StatusBarView.h (modified) (1 diff)
• StatusBarView.m (modified) (3 diffs)

trunk/macosx/StatusBarView.h

@@ -29 +29 @@
 @interface StatusBarView : NSView
 {
-    CTGradient * fGradient;
+    NSGradient * fGradient;
 }
 

trunk/macosx/StatusBarView.m

@@ -24 +24 @@
 
 #import "StatusBarView.h"
-#import "CTGradient.h"
+#import "NSApplicationAdditions.h"
 
 @implementation StatusBarView
@@ -32 +32 @@
     if ((self = [super initWithFrame: rect]))
     {
-        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];
+        if ([NSApp isOnLeopardOrBetter])
+        {
+            NSColor * startingColor = [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 = [[NSGradient alloc] initWithStartingColor: startingColor endingColor: endingColor];
+        }
     }
     return self;
@@ -47 +50 @@
 - (BOOL) isOpaque
 {
-    return YES;
+    return [NSApp isOnLeopardOrBetter];
 }
 
 - (void) drawRect: (NSRect) rect
 {
-    [fGradient fillRect: rect angle: 90];
+    [fGradient drawInRect: rect angle: 90];
 }