diff --git a/widget/cocoa/nsNativeThemeCocoa.h b/widget/cocoa/nsNativeThemeCocoa.h index 9642fd795963..1b606b6baf94 100644 --- a/widget/cocoa/nsNativeThemeCocoa.h +++ b/widget/cocoa/nsNativeThemeCocoa.h @@ -383,6 +383,8 @@ protected: bool aIsMain); void DrawUnifiedToolbar(CGContextRef cgContext, const HIRect& inBoxRect, const UnifiedToolbarParams& aParams); + void DrawNativeTitlebar(CGContextRef aContext, CGRect aTitlebarRect, + const UnifiedToolbarParams& aParams); void DrawStatusBar(CGContextRef cgContext, const HIRect& inBoxRect, bool aIsMain); void DrawResizer(CGContextRef cgContext, const HIRect& aRect, bool aIsRTL); diff --git a/widget/cocoa/nsNativeThemeCocoa.mm b/widget/cocoa/nsNativeThemeCocoa.mm index 51bcca865676..c4bfa39ab910 100644 --- a/widget/cocoa/nsNativeThemeCocoa.mm +++ b/widget/cocoa/nsNativeThemeCocoa.mm @@ -2660,6 +2660,14 @@ nsNativeThemeCocoa::DrawNativeTitlebar(CGContextRef aContext, CGRect aTitlebarRe DrawNativeTitlebarToolbarWithSquareCorners(aContext, aTitlebarRect, unifiedHeight, aIsMain, aIsFlipped); } +void +nsNativeThemeCocoa::DrawNativeTitlebar(CGContextRef aContext, CGRect aTitlebarRect, + const UnifiedToolbarParams& aParams) +{ + DrawNativeTitlebar(aContext, aTitlebarRect, aParams.unifiedHeight, + aParams.isMain, YES); +} + static void RenderResizer(CGContextRef cgContext, const HIRect& aRenderRect, void* aData) { @@ -3160,10 +3168,11 @@ nsNativeThemeCocoa::DrawWidgetBackground(gfxContext* aContext, case NS_THEME_WINDOW_TITLEBAR: { NSWindow* win = NativeWindowForFrame(aFrame); - BOOL isMain = [win isMainWindow]; + bool isMain = [win isMainWindow]; float unifiedToolbarHeight = [win isKindOfClass:[ToolbarWindow class]] ? [(ToolbarWindow*)win unifiedToolbarHeight] : macRect.size.height; - DrawNativeTitlebar(cgContext, macRect, unifiedToolbarHeight, isMain, YES); + DrawNativeTitlebar(cgContext, macRect, + UnifiedToolbarParams{unifiedToolbarHeight, isMain}); } break;