Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 18:08:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 507947 - Use CGContextFillRect instead of NSRectFill when drawing toolbars and other grey boxes in native theming. r=josh

Browse Source
This commit is contained in:
Markus Stange 2009-08-04 10:27:31 +12:00
parent 3c3887f265
commit b78c840045
3 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
widget/src/cocoa/nsCocoaWindow.mm
View File

@ -2077,8 +2077,8 @@ void patternDraw(void* aInfo, CGContextRef aContext)
// Draw the one pixel border at the bottom of the titlebar.
if ([window unifiedToolbarHeight] == 0) {
[NativeGreyColorAsNSColor(headerBorderGrey, isMain) set];
NSRectFill(NSMakeRect(0.0f, titlebarOrigin, sPatternWidth, 1.0f));
CGRect borderRect = CGRectMake(0.0f, titlebarOrigin, sPatternWidth, 1.0f);
DrawNativeGreyColorInRect(aContext, headerBorderGrey, borderRect, isMain);
}
} else {
// if the titlebar color is not nil, just set and draw it normally.

42
widget/src/cocoa/nsNativeThemeCocoa.mm
View File

@ -1354,7 +1354,7 @@ nsNativeThemeCocoa::DrawUnifiedToolbar(CGContextRef cgContext, const HIRect& inB
[(ToolbarWindow*)win setUnifiedToolbarHeight:inBoxRect.size.height];
}
BOOL isMain = win ? [win isMainWindow] : YES;
BOOL isMain = [win isMainWindow] || ![NSView focusView];
// Draw the gradient
UnifiedGradientInfo info = { titlebarHeight, inBoxRect.size.height, isMain, NO };
@ -1374,9 +1374,10 @@ nsNativeThemeCocoa::DrawUnifiedToolbar(CGContextRef cgContext, const HIRect& inB
CGShadingRelease(shading);
// Draw the border at the bottom of the toolbar.
[NativeGreyColorAsNSColor(headerBorderGrey, isMain) set];
NSRectFill(NSMakeRect(inBoxRect.origin.x, inBoxRect.origin.y +
inBoxRect.size.height - 1.0f, inBoxRect.size.width, 1.0f));
CGRect borderRect = CGRectMake(inBoxRect.origin.x, inBoxRect.origin.y +
inBoxRect.size.height - 1.0f,
inBoxRect.size.width, 1.0f);
DrawNativeGreyColorInRect(cgContext, headerBorderGrey, borderRect, isMain);
NS_OBJC_END_TRY_ABORT_BLOCK;
}
@ -1428,15 +1429,14 @@ nsNativeThemeCocoa::DrawStatusBar(CGContextRef cgContext, const HIRect& inBoxRec
if (inBoxRect.size.height < 2.0f)
return;
BOOL isMain = [NativeWindowForFrame(aFrame) isMainWindow];
BOOL isMain = [NativeWindowForFrame(aFrame) isMainWindow] || ![NSView focusView];
// Draw the borders at the top of the statusbar.
[NativeGreyColorAsNSColor(statusbarFirstTopBorderGrey, isMain) set];
NSRectFill(NSMakeRect(inBoxRect.origin.x, inBoxRect.origin.y,
inBoxRect.size.width, 1.0f));
[NativeGreyColorAsNSColor(statusbarSecondTopBorderGrey, isMain) set];
NSRectFill(NSMakeRect(inBoxRect.origin.x, inBoxRect.origin.y + 1.0f,
inBoxRect.size.width, 1.0f));
CGRect rect = CGRectMake(inBoxRect.origin.x, inBoxRect.origin.y,
inBoxRect.size.width, 1.0f);
DrawNativeGreyColorInRect(cgContext, statusbarFirstTopBorderGrey, rect, isMain);
rect.origin.y += 1.0f;
DrawNativeGreyColorInRect(cgContext, statusbarSecondTopBorderGrey, rect, isMain);
// Draw the gradient.
DrawGreyGradient(cgContext, CGRectMake(inBoxRect.origin.x, inBoxRect.origin.y + 2.0f,
@ -1633,22 +1633,22 @@ nsNativeThemeCocoa::DrawWidgetBackground(nsIRenderingContext* aContext, nsIFrame
break;
case NS_THEME_TOOLBAR: {
BOOL isMain = [NativeWindowForFrame(aFrame) isMainWindow];
BOOL isMain = [NativeWindowForFrame(aFrame) isMainWindow] || ![NSView focusView];
CGRect drawRect = macRect;
// top border
[NativeGreyColorAsNSColor(toolbarTopBorderGrey, isMain) set];
NSRectFill(NSMakeRect(macRect.origin.x, macRect.origin.y,
macRect.size.width, 1.0f));
drawRect.size.height = 1.0f;
DrawNativeGreyColorInRect(cgContext, toolbarTopBorderGrey, drawRect, isMain);
// background
[NativeGreyColorAsNSColor(headerEndGrey, isMain) set];
NSRectFill(NSMakeRect(macRect.origin.x, macRect.origin.y + 1.0f,
macRect.size.width, macRect.size.height - 2.0f));
drawRect.origin.y += drawRect.size.height;
drawRect.size.height = macRect.size.height - 2.0f;
DrawNativeGreyColorInRect(cgContext, headerEndGrey, drawRect, isMain);
// bottom border
[NativeGreyColorAsNSColor(headerBorderGrey, isMain) set];
NSRectFill(NSMakeRect(macRect.origin.x, macRect.origin.y +
macRect.size.height - 1.0f, macRect.size.width, 1.0f));
drawRect.origin.y += drawRect.size.height;
drawRect.size.height = 1.0f;
DrawNativeGreyColorInRect(cgContext, headerBorderGrey, drawRect, isMain);
}
break;

7
widget/src/cocoa/nsNativeThemeColors.h
View File

@ -75,9 +75,12 @@ static float NativeGreyColorAsFloat(ColorName name, BOOL isMain)
return NativeGreyColorAsInt(name, isMain) / 255.0f;
}
static NSColor* NativeGreyColorAsNSColor(ColorName name, BOOL isMain)
static void DrawNativeGreyColorInRect(CGContextRef context, ColorName name,
CGRect rect, BOOL isMain)
{
return [NSColor colorWithDeviceWhite:NativeGreyColorAsFloat(name, isMain) alpha:1.0f];
float grey = NativeGreyColorAsFloat(name, isMain);
CGContextSetRGBFillColor(context, grey, grey, grey, 1.0f);
CGContextFillRect(context, rect);
}
#endif // nsNativeThemeColors_h_