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

Make wxGCDC behavior with 0-width wxPen consistent with MSW wxDC

Browse Source 
MSW uses a 1-pixel width in that case. See #19077
This commit is contained in:
Paul Cornett
2021-03-02 10:50:39 -08:00
parent 9d0aee5ee6
commit 0d80050057
1 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/common/dcgraph.cpp
View File

@@ -518,10 +518,36 @@ void wxGCDCImpl::SetFont( const wxFont &font )
void wxGCDCImpl::SetPen( const wxPen &pen )
{
m_pen = pen;
if ( m_graphicContext )
if (m_graphicContext == NULL)
return;
wxPenStyle style;
if (!pen.IsOk() || (style = pen.GetStyle()) == wxPENSTYLE_TRANSPARENT)
{
m_graphicContext->SetPen( m_pen );
m_graphicContext->SetPen(wxGraphicsPen());
return;
}
// 0-width pen is 1 pixel wide with MSW wxDC
const int w = pen.GetWidth();
const double width = w ? double(w) : 1 / wxMin(m_scaleX, m_scaleY);
wxGraphicsPenInfo info(pen.GetColour(), width, style);
info.Join(pen.GetJoin()).Cap(pen.GetCap());
if (style == wxPENSTYLE_USER_DASH)
{
wxDash* dashes;
if (int n = pen.GetDashes(&dashes))
info.Dashes(n, dashes);
}
else if (style == wxPENSTYLE_STIPPLE)
{
if (const wxBitmap* stipple = pen.GetStipple())
info.Stipple(*stipple);
}
m_graphicContext->SetPen(m_graphicContext->CreatePen(info));
}
void wxGCDCImpl::SetBrush( const wxBrush &brush )