Fixed a bug where the CPAlert was being displayed with black text on …

…a black background if the styleMask was set to 'CPHUDBackgroundWindowMask' and something else. cappuccino#220
280north · Oct 9, 2009 · e125139 · e125139
1 parent bc6f168
commit e125139
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/AppKit/CPAlert.j b/AppKit/CPAlert.j
@@ -149,15 +149,15 @@ var CPAlertWarningImage,
     [_alertPanel setFloatingPanel:YES];
     [_alertPanel center];
 
-    [_messageLabel setTextColor:(styleMask == CPHUDBackgroundWindowMask) ? [CPColor whiteColor] : [CPColor blackColor]];
+    [_messageLabel setTextColor:(styleMask & CPHUDBackgroundWindowMask) ? [CPColor whiteColor] : [CPColor blackColor]];
 
     var count = [_buttons count];
     for(var i=0; i < count; i++)
     {
         var button = _buttons[i];
 
         [button setFrameSize:CGSizeMake([button frame].size.width, (styleMask == CPHUDBackgroundWindowMask) ? 20.0 : 24.0)];
-        [button setBezelStyle:(styleMask == CPHUDBackgroundWindowMask) ? CPHUDBezelStyle : CPRoundedBezelStyle];
+        [button setBezelStyle:(styleMask & CPHUDBackgroundWindowMask) ? CPHUDBezelStyle : CPRoundedBezelStyle];
 
         [[_alertPanel contentView] addSubview:button];
     }