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

Fix wxGraphicsPath::MoveToPoint for Direct2D

Browse Source 
Calling MoveToPoint() shouldn't automatically open a new D2D figure (which
acts as a subpath) because in case of consecutive calls to MoveToPoint()
every next call would close the figure opened by the previous call and
we would get spurious figure(s) (consisting one point).
Opening a D2D figure (subpath) should be delgated to the functions doing
actual drawing.
This commit is contained in:
Artur Wieczorek
2018-07-28 11:46:28 +02:00
parent 74306708bc
commit c8fe811636
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/msw/graphicsd2d.cpp
View File

@@ -1450,11 +1450,8 @@ void wxD2DPathData::MoveToPoint(wxDouble x, wxDouble y)
{
// Close current sub-path (leaving the figure as is).
EndFigure(D2D1_FIGURE_END_OPEN);
// And open a new sub-path.
D2D1_POINT_2F p = D2D1::Point2F(x, y);
EnsureFigureOpen(p);
m_currentPoint = p;
// Store new current point
m_currentPoint = D2D1::Point2F(x, y);
m_currentPointSet = true;
}
@@ -1480,11 +1477,11 @@ void wxD2DPathData::AddCurveToPoint(wxDouble cx1, wxDouble cy1, wxDouble cx2, wx
{
// If no current point is set then this function should behave
// as if preceded by a call to MoveToPoint(cx1, cy1).
if( m_currentPointSet )
EnsureFigureOpen(m_currentPoint);
else
if( !m_currentPointSet )
MoveToPoint(cx1, cy1);
EnsureFigureOpen(m_currentPoint);
D2D1_BEZIER_SEGMENT bezierSegment = {
{ (FLOAT)cx1, (FLOAT)cy1 },
{ (FLOAT)cx2, (FLOAT)cy2 },
@@ -1536,13 +1533,19 @@ void wxD2DPathData::AddArc(wxDouble x, wxDouble y, wxDouble r, wxDouble startAng
// To ensure compatibility with Cairo an initial
// line segment to the beginning of the arc needs
// to be added to the path.
if (m_figureOpened)
if ( m_figureOpened )
{
AddLineToPoint(start.m_x + x, start.m_y + y);
}
else if ( m_currentPointSet )
{
EnsureFigureOpen(m_currentPoint);
AddLineToPoint(start.m_x + x, start.m_y + y);
}
else
{
MoveToPoint(start.m_x + x, start.m_y + y);
EnsureFigureOpen(m_currentPoint);
}
D2D1_SWEEP_DIRECTION sweepDirection = clockwise ?
@@ -1626,6 +1629,8 @@ void wxD2DPathData::AddEllipse(wxDouble x, wxDouble y, wxDouble w, wxDouble h)
const wxDouble ry = h / 2.0;
MoveToPoint(x + w, y + ry);
// Open new subpath
EnsureFigureOpen(m_currentPoint);
D2D1_ARC_SEGMENT arcSegmentLower =
{