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

Fixed cloning wxD2DPathData.

Browse Source 
In addition to copying the underlying geometry sink itself also auxiliary data, like collection of transformed geometries and positional data have to copied the the new wxD2DPathData instance.
This commit is contained in:
Artur Wieczorek
2016-05-26 17:55:33 +02:00
parent 2b13dc7473
commit 7923cb222e
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/msw/graphicsd2d.cpp
View File

@@ -1136,8 +1136,8 @@ wxD2DPathData::wxGraphicsObjectRefData* wxD2DPathData::Clone() const
newPathData->EnsureGeometryOpen(); newPathData->EnsureGeometryOpen();
// Only geometry with closed sink (immutable) // Only geometry with closed sink can be
// can be transferred to another geometry object with // transferred to another geometry object with
// ID2D1PathGeometry::Stream() so we have to check // ID2D1PathGeometry::Stream() so we have to check
// if actual transfer succeeded. // if actual transfer succeeded.
@@ -1149,10 +1149,23 @@ wxD2DPathData::wxGraphicsObjectRefData* wxD2DPathData::Clone() const
delete newPathData; delete newPathData;
return NULL; return NULL;
} }
// Copy auxiliary data.
newPathData->m_currentPoint = m_currentPoint; // Copy the collection of transformed geometries.
newPathData->m_figureOpened = m_figureOpened; ID2D1TransformedGeometry* pTransformedGeometry;
newPathData->m_figureStart = m_figureStart; for ( size_t i = 0; i < m_pTransformedGeometries.size(); i++ )
{
pTransformedGeometry = NULL;
hr = m_direct2dfactory->CreateTransformedGeometry(
m_pTransformedGeometries[i],
D2D1::Matrix3x2F::Identity(), &pTransformedGeometry);
wxASSERT_MSG( SUCCEEDED(hr), wxFAILED_HRESULT_MSG(hr) );
newPathData->m_pTransformedGeometries.push_back(pTransformedGeometry);
}
// Copy positional data.
GeometryStateData curState;
SaveGeometryState(curState);
newPathData->RestoreGeometryState(curState);
return newPathData; return newPathData;
} }