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

Fix drawing shapes with transparent borders in wxGtkPrinterDC

Browse Source 
Stroke the path of the shape only if pen using in drawing is
non-transparent. Otherwise, the shape would have a visible border even for
transparent pen.
This commit is contained in:
Artur Wieczorek
2017-05-26 00:20:48 +02:00
parent ef3863a71e
commit b99f4d9327
1 changed files with 50 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/gtk/print.cpp
View File

@@ -1447,11 +1447,17 @@ void wxGtkPrinterDCImpl::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,w
cairo_close_path (m_cairo); cairo_close_path (m_cairo);
SetBrush( m_brush ); SetBrush( m_brush );
if ( m_pen.IsTransparent() )
cairo_fill(m_cairo);
else
cairo_fill_preserve(m_cairo); cairo_fill_preserve(m_cairo);
} }
SetPen(m_pen); SetPen(m_pen);
if ( m_pen.IsNonTransparent() )
{
cairo_stroke(m_cairo); cairo_stroke(m_cairo);
}
CalcBoundingBox (x1, y1); CalcBoundingBox (x1, y1);
CalcBoundingBox (xc, yc); CalcBoundingBox (xc, yc);
@@ -1546,10 +1552,16 @@ void wxGtkPrinterDCImpl::DoDrawPolygon(int n, const wxPoint points[],
cairo_close_path(m_cairo); cairo_close_path(m_cairo);
SetBrush( m_brush ); SetBrush( m_brush );
if ( m_pen.IsTransparent() )
cairo_fill(m_cairo);
else
cairo_fill_preserve(m_cairo); cairo_fill_preserve(m_cairo);
SetPen(m_pen); SetPen(m_pen);
if ( m_pen.IsNonTransparent() )
{
cairo_stroke(m_cairo); cairo_stroke(m_cairo);
}
CalcBoundingBox( x, y ); CalcBoundingBox( x, y );
@@ -1565,17 +1577,27 @@ void wxGtkPrinterDCImpl::DoDrawPolyPolygon(int n, const int count[], const wxPoi
void wxGtkPrinterDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) void wxGtkPrinterDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
{ {
width--; if ( m_pen.IsNonTransparent() )
height--; {
// outline is one pixel larger than what raster-based wxDC implementations draw
width -= 1;
height -= 1;
}
cairo_new_path(m_cairo); cairo_new_path(m_cairo);
cairo_rectangle ( m_cairo, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEVREL(width), YLOG2DEVREL(height)); cairo_rectangle ( m_cairo, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEVREL(width), YLOG2DEVREL(height));
SetBrush( m_brush ); SetBrush( m_brush );
if ( m_pen.IsTransparent() )
cairo_fill(m_cairo);
else
cairo_fill_preserve(m_cairo); cairo_fill_preserve(m_cairo);
SetPen(m_pen); SetPen(m_pen);
if ( m_pen.IsNonTransparent() )
{
cairo_stroke(m_cairo); cairo_stroke(m_cairo);
}
CalcBoundingBox( x, y ); CalcBoundingBox( x, y );
CalcBoundingBox( x + width, y + height ); CalcBoundingBox( x + width, y + height );
@@ -1620,10 +1642,16 @@ void wxGtkPrinterDCImpl::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord wi
cairo_close_path(m_cairo); cairo_close_path(m_cairo);
SetBrush(m_brush); SetBrush(m_brush);
if ( m_pen.IsTransparent() )
cairo_fill(m_cairo);
else
cairo_fill_preserve(m_cairo); cairo_fill_preserve(m_cairo);
SetPen(m_pen); SetPen(m_pen);
if ( m_pen.IsNonTransparent() )
{
cairo_stroke(m_cairo); cairo_stroke(m_cairo);
}
CalcBoundingBox(x,y); CalcBoundingBox(x,y);
CalcBoundingBox(x+width,y+height); CalcBoundingBox(x+width,y+height);
@@ -1643,10 +1671,16 @@ void wxGtkPrinterDCImpl::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCo
cairo_arc ( m_cairo, 0, 0, XLOG2DEVREL(width/2), 0, 2 * M_PI); cairo_arc ( m_cairo, 0, 0, XLOG2DEVREL(width/2), 0, 2 * M_PI);
SetBrush( m_brush ); SetBrush( m_brush );
if ( m_pen.IsTransparent() )
cairo_fill(m_cairo);
else
cairo_fill_preserve(m_cairo); cairo_fill_preserve(m_cairo);
SetPen(m_pen); SetPen(m_pen);
if ( m_pen.IsNonTransparent() )
{
cairo_stroke(m_cairo); cairo_stroke(m_cairo);
}
CalcBoundingBox( x, y ); CalcBoundingBox( x, y );
CalcBoundingBox( x + width, y + height ); CalcBoundingBox( x + width, y + height );