Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing a problem where CoreGraphics didn't correctly clip to an empty region

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@53845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2008-05-30 16:47:45 +00:00
parent a69994a545
commit 66b926e0cf
1 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/mac/carbon/graphics.cpp
View File

@@ -1345,9 +1345,6 @@ void wxMacCoreGraphicsContext::Init()
m_cgContext = NULL; m_cgContext = NULL;
m_releaseContext = false; m_releaseContext = false;
m_windowRef = NULL; m_windowRef = NULL;
HIRect r = CGRectMake(0,0,0,0);
m_clipRgn.Set(HIShapeCreateWithRect(&r));
} }
wxMacCoreGraphicsContext::wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer, CGContextRef cgcontext ) : wxGraphicsContext(renderer) wxMacCoreGraphicsContext::wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer, CGContextRef cgcontext ) : wxGraphicsContext(renderer)
@@ -1408,7 +1405,7 @@ void wxMacCoreGraphicsContext::EnsureIsValid()
CGContextConcatCTM( m_cgContext, m_windowTransform ); CGContextConcatCTM( m_cgContext, m_windowTransform );
CGContextSaveGState( m_cgContext ); CGContextSaveGState( m_cgContext );
m_releaseContext = true; m_releaseContext = true;
if ( !HIShapeIsEmpty(m_clipRgn) ) if ( (HIShapeRef) m_clipRgn != NULL )
{ {
// the clip region is in device coordinates, so we convert this again to user coordinates // the clip region is in device coordinates, so we convert this again to user coordinates
wxMacCFRefHolder<HIMutableShapeRef> hishape ; wxMacCFRefHolder<HIMutableShapeRef> hishape ;
@@ -1416,7 +1413,17 @@ void wxMacCoreGraphicsContext::EnsureIsValid()
CGPoint transformedOrigin = CGPointApplyAffineTransform( CGPointZero,m_windowTransform); CGPoint transformedOrigin = CGPointApplyAffineTransform( CGPointZero,m_windowTransform);
HIShapeOffset( hishape, -transformedOrigin.x, -transformedOrigin.y ); HIShapeOffset( hishape, -transformedOrigin.x, -transformedOrigin.y );
HIShapeReplacePathInCGContext( hishape, m_cgContext ); HIShapeReplacePathInCGContext( hishape, m_cgContext );
CGContextClip( m_cgContext ); // if the shape is empty, HIShapeReplacePathInCGContext doesn't work
if ( HIShapeIsEmpty(hishape))
{
CGRect empty = CGRectMake( 0,0,0,0 );
CGContextClipToRect( m_cgContext, empty );
}
else
{
HIShapeReplacePathInCGContext( hishape, m_cgContext );
CGContextClip( m_cgContext );
}
} }
CGContextSaveGState( m_cgContext ); CGContextSaveGState( m_cgContext );
} }
@@ -1464,10 +1471,19 @@ void wxMacCoreGraphicsContext::Clip( const wxRegion &region )
{ {
if( m_cgContext ) if( m_cgContext )
{ {
HIShapeRef shape = HIShapeCreateWithQDRgn( (RgnHandle) region.GetWXHRGN() ); wxMacCFRefHolder<HIShapeRef> shape;
HIShapeReplacePathInCGContext( shape, m_cgContext ); shape = HIShapeCreateWithQDRgn( (RgnHandle) region.GetWXHRGN() );
CGContextClip( m_cgContext ); // if the shape is empty, HIShapeReplacePathInCGContext doesn't work
CFRelease( shape ); if ( HIShapeIsEmpty(shape))
{
CGRect empty = CGRectMake( 0,0,0,0 );
CGContextClipToRect( m_cgContext, empty );
}
else
{
HIShapeReplacePathInCGContext( shape, m_cgContext );
CGContextClip( m_cgContext );
}
} }
else else
{ {
@@ -1517,8 +1533,7 @@ void wxMacCoreGraphicsContext::ResetClip()
} }
else else
{ {
HIRect r = CGRectMake(0,0,0,0); m_clipRgn.Release();
m_clipRgn.Set(HIShapeCreateWithRect(&r));
} }
} }