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

Fixed creating wxGraphicsPath with Direct2D renderer.

Browse Source 
When current endpoint is moved to a new position with MoveToPoint() then current sub-path should be ended without closing the figure (no line from the current point to the beginning of the sub-path should be added).

Closes #17516
This commit is contained in:
Artur Wieczorek
2016-05-01 19:02:58 +02:00
parent 98f5315405
commit 1e6cf64a2a
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/msw/graphicsd2d.cpp
View File

@@ -1017,6 +1017,8 @@ private:
void EnsureFigureOpen(wxDouble x = 0, wxDouble y = 0); void EnsureFigureOpen(wxDouble x = 0, wxDouble y = 0);
void EndFigure(D2D1_FIGURE_END figureEnd);
private : private :
wxCOMPtr<ID2D1PathGeometry> m_pathGeometry; wxCOMPtr<ID2D1PathGeometry> m_pathGeometry;
@@ -1129,13 +1131,20 @@ void wxD2DPathData::EnsureFigureOpen(wxDouble x, wxDouble y)
} }
} }
void wxD2DPathData::MoveToPoint(wxDouble x, wxDouble y) void wxD2DPathData::EndFigure(D2D1_FIGURE_END figureEnd)
{ {
if (m_figureOpened) if (m_figureOpened)
{ {
CloseSubpath(); m_geometrySink->EndFigure(figureEnd);
m_figureOpened = false;
} }
}
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.
EnsureFigureOpen(x, y); EnsureFigureOpen(x, y);
m_currentPoint = D2D1::Point2F(x, y); m_currentPoint = D2D1::Point2F(x, y);
@@ -1275,11 +1284,8 @@ void wxD2DPathData::AddPath(const wxGraphicsPathData* path)
// closes the current sub-path // closes the current sub-path
void wxD2DPathData::CloseSubpath() void wxD2DPathData::CloseSubpath()
{ {
if (m_figureOpened) // Close sub-path and close the figure.
{ EndFigure(D2D1_FIGURE_END_CLOSED);
m_geometrySink->EndFigure(D2D1_FIGURE_END_CLOSED);
m_figureOpened = false;
}
} }
void* wxD2DPathData::GetNativePath() const void* wxD2DPathData::GetNativePath() const