зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1421088
- Create a DrawNativeTitlebar overload that takes a UnifiedToolbarParams param. r=spohl
MozReview-Commit-ID: Gxe4qIZV7HI --HG-- extra : rebase_source : c9f2b295bf7270f2167641ec27901878f5b362f7
This commit is contained in:
Родитель
b1e02d2039
Коммит
c8c263cd37
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче