Macintosh-SW/tenfourfox
1
0
Fork 0
mirror of https://github.com/classilla/tenfourfox.git synced 2024-05-28 20:41:33 +00:00
Code Issues Projects Releases Wiki Activity

save graphic context, tweak calculation

Browse Source
This commit is contained in:
Riccardo Mottola 2018-09-26 01:34:56 +02:00
parent 910f7e3494
commit 862f3e4d6c
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
widget/cocoa/nsNativeThemeCocoa.mm
View File

@ -2484,7 +2484,6 @@ nsNativeThemeCocoa::DrawUnifiedToolbar(CGContextRef cgContext, const HIRect& inB
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
#if(0)
CGContextSaveGState(cgContext);
CGContextClipToRect(cgContext, inBoxRect);
@ -2492,22 +2491,16 @@ nsNativeThemeCocoa::DrawUnifiedToolbar(CGContextRef cgContext, const HIRect& inB
inBoxRect.size.height);
BOOL isMain = [aWindow isMainWindow];
CGFloat titlebarHeight = unifiedHeight - inBoxRect.size.height;
#if(0)
CGRect drawRect = CGRectMake(inBoxRect.origin.x, inBoxRect.origin.y - titlebarHeight,
inBoxRect.size.width, inBoxRect.size.height + titlebarHeight);
DrawNativeTitlebarToolbarWithSquareCorners(cgContext, drawRect, unifiedHeight, isMain, YES);
CGContextRestoreGState(cgContext);
#else
// Backout bug 668195, 676241 et al.
// XXX This is probably not the best solution for the future because we
// aren't actually upgrading the component calls, but it will suffice for now.
float titlebarHeight = [(ToolbarWindow*)aWindow titlebarHeight];
// This may need modification (see above).
float unifiedHeight = titlebarHeight + inBoxRect.size.height;
BOOL isMain = [aWindow isMainWindow];
// Draw the gradient
UnifiedGradientInfo info = { titlebarHeight, inBoxRect.size.height, isMain, NO };
struct CGFunctionCallbacks callbacks = { 0, nsCocoaWindow::UnifiedShading, NULL };
@ -2521,7 +2514,6 @@ nsNativeThemeCocoa::DrawUnifiedToolbar(CGContextRef cgContext, const HIRect& inB
NO, NO);
CGColorSpaceRelease(colorSpace);
CGFunctionRelease(function);
CGContextClipToRect(cgContext, inBoxRect);
CGContextDrawShading(cgContext, shading);
CGShadingRelease(shading);
@ -2531,6 +2523,7 @@ nsNativeThemeCocoa::DrawUnifiedToolbar(CGContextRef cgContext, const HIRect& inB
inBoxRect.size.width, 1.0f);
DrawNativeGreyColorInRect(cgContext, headerBorderGrey, borderRect, isMain);
#endif
CGContextRestoreGState(cgContext);
NS_OBJC_END_TRY_ABORT_BLOCK;
}
@ -2584,9 +2577,9 @@ nsNativeThemeCocoa::DrawStatusBar(CGContextRef cgContext, const HIRect& inBoxRec
if (inBoxRect.size.height < 2.0f)
return;
CGContextSaveGState(cgContext);
// backout bug 668195
#if(0)
CGContextSaveGState(cgContext);
CGContextClipToRect(cgContext, inBoxRect);
// kCUIWidgetWindowFrame draws a complete window frame with both title bar
@ -2606,7 +2599,6 @@ nsNativeThemeCocoa::DrawStatusBar(CGContextRef cgContext, const HIRect& inBoxRec
[NSNumber numberWithBool:YES], @"is.flipped",
nil]);
CGContextRestoreGState(cgContext);
#else
BOOL isMain = [NativeWindowForFrame(aFrame) isMainWindow] || ![NSView focusView];
@ -2623,6 +2615,7 @@ nsNativeThemeCocoa::DrawStatusBar(CGContextRef cgContext, const HIRect& inBoxRec
NativeGreyColorAsFloat(statusbarGradientStartGrey, isMain),
NativeGreyColorAsFloat(statusbarGradientEndGrey, isMain));
#endif
CGContextRestoreGState(cgContext);
NS_OBJC_END_TRY_ABORT_BLOCK;
}