wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 770056 - Remove [NSView focusView] conditions from cocoa theme code. r=mstange

Browse Source
This commit is contained in:
Matt Woodrow 2012-08-20 22:00:49 +12:00
parent 6a9fa4c810
commit ba5189e7b5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
widget/cocoa/nsNativeThemeCocoa.mm
View File

@ -379,7 +379,7 @@ static BOOL FrameIsInActiveWindow(nsIFrame* aFrame)
static BOOL IsActive(nsIFrame* aFrame, BOOL aIsToolbarControl)
{
if (aIsToolbarControl)
return [NativeWindowForFrame(aFrame) isMainWindow] || ![NSView focusView];
return [NativeWindowForFrame(aFrame) isMainWindow];
return FrameIsInActiveWindow(aFrame);
}
@ -1789,7 +1789,7 @@ nsNativeThemeCocoa::DrawUnifiedToolbar(CGContextRef cgContext, const HIRect& inB
float titlebarHeight = [(ToolbarWindow*)aWindow titlebarHeight];
float unifiedHeight = titlebarHeight + inBoxRect.size.height;
BOOL isMain = [aWindow isMainWindow] || ![NSView focusView];
BOOL isMain = [aWindow isMainWindow];
CGContextSaveGState(cgContext);
CGContextClipToRect(cgContext, inBoxRect);
@ -2074,7 +2074,7 @@ nsNativeThemeCocoa::DrawWidgetBackground(nsRenderingContext* aContext,
DrawUnifiedToolbar(cgContext, macRect, win);
break;
}
BOOL isMain = [win isMainWindow] || ![NSView focusView];
BOOL isMain = [win isMainWindow];
CGRect drawRect = macRect;
// top border