diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2015-01-07 08:31:28 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2015-01-07 08:54:46 +0100 |
| commit | 3a74b40f0f862fc099adb93a528d469903031583 (patch) | |
| tree | 040803c14facc093a24f4f2ba1e75cf4047ddb24 /vcl/opengl | |
| parent | 2ca2b8c2e0926a1562ea9dfbe16b686230e20638 (diff) | |
make sure to use the FillColor when we used it before
Change-Id: I36443d12e1607221b9505d1e05a51e804d714e16
Diffstat (limited to 'vcl/opengl')
| -rw-r--r-- | vcl/opengl/gdiimpl.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx index 69b413813456..fb436a48d419 100644 --- a/vcl/opengl/gdiimpl.cxx +++ b/vcl/opengl/gdiimpl.cxx @@ -198,7 +198,7 @@ void OpenGLSalGraphicsImpl::ImplSetClipBit( const vcl::Region& rClip, GLuint nMa if( rClip.getRegionBand() ) DrawRegionBand( *rClip.getRegionBand() ); else - DrawPolyPolygon( rClip.GetAsB2DPolyPolygon(), true ); + DrawPolyPolygon( rClip.GetAsB2DPolyPolygon(), false, true ); } glColorMask( GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE ); @@ -695,11 +695,11 @@ void OpenGLSalGraphicsImpl::DrawPolygon( sal_uInt32 nPoints, const SalPoint* pPt else { const ::basegfx::B2DPolyPolygon aPolyPolygon( aPolygon ); - DrawPolyPolygon( aPolyPolygon ); + DrawPolyPolygon( aPolyPolygon, false ); } } -void OpenGLSalGraphicsImpl::DrawPolyPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon, bool blockAA ) +void OpenGLSalGraphicsImpl::DrawPolyPolygon( const basegfx::B2DPolyPolygon& rPolyPolygon, bool bLine, bool blockAA ) { ::std::vector< GLfloat > aVertices; GLfloat nWidth = GetWidth(); @@ -745,7 +745,7 @@ void OpenGLSalGraphicsImpl::DrawPolyPolygon( const basegfx::B2DPolyPolygon& rPol DrawLineAA( rPt1.getX(), rPt1.getY(), rPt2.getX(), rPt2.getY()); } } - UseSolid( mnLineColor ); + UseSolid( bLine ? mnLineColor : mnFillColor ); } CHECK_GL_ERROR(); @@ -1133,7 +1133,7 @@ bool OpenGLSalGraphicsImpl::drawPolyPolygon( const ::basegfx::B2DPolyPolygon& rP for( sal_uInt32 i = 0; i < rPolyPolygon.count(); i++ ) { const ::basegfx::B2DPolyPolygon aOnePoly( rPolyPolygon.getB2DPolygon( i ) ); - DrawPolyPolygon( aOnePoly ); + DrawPolyPolygon( aOnePoly, false ); } } @@ -1216,7 +1216,7 @@ bool OpenGLSalGraphicsImpl::drawPolyLine( for( sal_uInt32 i = 0; i < aAreaPolyPoly.count(); i++ ) { const ::basegfx::B2DPolyPolygon aOnePoly( aAreaPolyPoly.getB2DPolygon( i ) ); - DrawPolyPolygon( aOnePoly ); + DrawPolyPolygon( aOnePoly, true ); } } PostDraw(); |