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

Make rectangle size the same as is drawn by raster-based wxDCs

Browse Source 
Outlined rectangles are one pixel larger with vector-based drawing,
adjust them to get consistent behavior.
Ellipses do not appear to need adjustment.
See #17091
This commit is contained in:
Paul Cornett
2015-08-09 22:06:59 -07:00
parent bf6f3e35e8
commit 4623c5ad9c
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/common/dcgraph.cpp
View File

@@ -881,10 +881,9 @@ void wxGCDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
CalcBoundingBox(x, y); CalcBoundingBox(x, y);
CalcBoundingBox(x + w, y + h); CalcBoundingBox(x + w, y + h);
if ( m_graphicContext->ShouldOffset() ) if (m_pen.IsOk() && m_pen.GetStyle() != wxPENSTYLE_TRANSPARENT && m_pen.GetWidth() > 0)
{ {
// if we are offsetting the entire rectangle is moved 0.5, so the // outline is one pixel larger than what raster-based wxDC implementations draw
// border line gets off by 1
w -= 1; w -= 1;
h -= 1; h -= 1;
} }
@@ -910,10 +909,9 @@ void wxGCDCImpl::DoDrawRoundedRectangle(wxCoord x, wxCoord y,
CalcBoundingBox(x, y); CalcBoundingBox(x, y);
CalcBoundingBox(x + w, y + h); CalcBoundingBox(x + w, y + h);
if ( m_graphicContext->ShouldOffset() ) if (m_pen.IsOk() && m_pen.GetStyle() != wxPENSTYLE_TRANSPARENT && m_pen.GetWidth() > 0)
{ {
// if we are offsetting the entire rectangle is moved 0.5, so the // outline is one pixel larger than what raster-based wxDC implementations draw
// border line gets off by 1
w -= 1; w -= 1;
h -= 1; h -= 1;
} }
@@ -930,13 +928,6 @@ void wxGCDCImpl::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
CalcBoundingBox(x, y); CalcBoundingBox(x, y);
CalcBoundingBox(x + w, y + h); CalcBoundingBox(x + w, y + h);
if ( m_graphicContext->ShouldOffset() )
{
// if we are offsetting the entire rectangle is moved 0.5, so the
// border line gets off by 1
w -= 1;
h -= 1;
}
m_graphicContext->DrawEllipse(x,y,w,h); m_graphicContext->DrawEllipse(x,y,w,h);
} }