Changeset 12864

Timestamp:

Sep 14, 2011, 3:31:34 AM (12 years ago)

Author:

livings124

Message:

before applying the gradient to the status and filter bars, check that the remaining rect is not empty

Location:

trunk/macosx

Files:

• FilterBarView.m (modified) (1 diff)
• StatusBarView.m (modified) (1 diff)

trunk/macosx/FilterBarView.m

@@ -81 +81 @@
     }
     
+    if (!NSIsEmptyRect(rect))
+    {
+        const NSRect gradientRect = NSMakeRect(NSMinX(rect), 1.0, NSWidth(rect), NSHeight([self bounds]) - 1.0 - 1.0); //proper gradient requires the full height of the bar
+        [fGradient drawInRect: gradientRect angle: 270.0];
+    }
+    
     NSRectFillListWithColors(gridRects, colorRects, count);
-    
-    const NSRect gradientRect = NSMakeRect(NSMinX(rect), 1.0, NSWidth(rect), NSHeight([self bounds]) - 1.0 - 1.0); //proper gradient requires the full height of the bar
-    [fGradient drawInRect: gradientRect angle: 270.0];
 }
 

trunk/macosx/StatusBarView.m

@@ -100 +100 @@
     }
     
-    if (active)
+    if (!NSIsEmptyRect(rect))
     {
-        const NSRect gradientRect = NSMakeRect(NSMinX(rect), 1.0, NSWidth(rect), NSHeight([self bounds]) - 1.0 - 1.0); //proper gradient requires the full height of the bar
-        [fGradient drawInRect: gradientRect angle: 270.0];
-    }
-    else
-    {
-        gridRects[count] = rect;
-        colorRects[count] = [NSColor colorWithCalibratedWhite: 0.85 alpha: 1.0];
-        ++count;
+        if (active)
+        {
+            const NSRect gradientRect = NSMakeRect(NSMinX(rect), 1.0, NSWidth(rect), NSHeight([self bounds]) - 1.0 - 1.0); //proper gradient requires the full height of the bar
+            [fGradient drawInRect: gradientRect angle: 270.0];
+        }
+        else
+        {
+            gridRects[count] = rect;
+            colorRects[count] = [NSColor colorWithCalibratedWhite: 0.85 alpha: 1.0];
+            ++count;
+        }
     }