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 934023 - Use the correct cell rect when drawing the window buttons. r=smichaud

Browse Source 
--HG--
extra : rebase_source : 02a43c9e84c3f796bb8dc547734dc2169915ce86
This commit is contained in:
Markus Stange 2013-11-20 17:21:24 +01:00
parent 8e97922181
commit 827e569121
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
widget/cocoa/nsChildView.mm
View File

@ -2198,7 +2198,8 @@ nsChildView::UpdateTitlebarImageBuffer()
if (dirtyTitlebarRegion.IsEmpty())
return;
ClearRegion(mTitlebarImageBuffer, dirtyTitlebarRegion);
gfxUtils::ClipToRegion(mTitlebarImageBuffer, dirtyTitlebarRegion);
mTitlebarImageBuffer->ClearRect(gfx::Rect(0, 0, titlebarBufferSize.width, titlebarBufferSize.height));
gfx::BorrowedCGContext borrow(mTitlebarImageBuffer);
CGContextRef ctx = borrow.cg;
@ -2222,9 +2223,7 @@ nsChildView::UpdateTitlebarImageBuffer()
for (id view in [window titlebarControls]) {
NSRect viewFrame = [view frame];
nsIntRect viewRect = CocoaPointsToDevPixels([mView convertRect:viewFrame fromView:frameView]);
nsIntRegion intersection;
intersection.And(dirtyTitlebarRegion, viewRect);
if (intersection.IsEmpty()) {
if (!dirtyTitlebarRegion.Intersects(viewRect)) {
continue;
}
// All of the titlebar controls we're interested in are subclasses of
@ -2249,8 +2248,7 @@ nsChildView::UpdateTitlebarImageBuffer()
[NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithGraphicsPort:ctx flipped:[view isFlipped]]];
NSRect intersectRect = DevPixelsToCocoaPoints(intersection.GetBounds());
[cell drawWithFrame:[view convertRect:intersectRect fromView:mView] inView:button];
[cell drawWithFrame:[button bounds] inView:button];
[NSGraphicsContext setCurrentContext:context];
CGContextRestoreGState(ctx);
@ -2264,6 +2262,8 @@ nsChildView::UpdateTitlebarImageBuffer()
[NSGraphicsContext setCurrentContext:oldContext];
borrow.Finish();
mTitlebarImageBuffer->PopClip();
mUpdatedTitlebarRegion.Or(mUpdatedTitlebarRegion, dirtyTitlebarRegion);
}