Fix applying affine transformation matrix in wxGCDC

In wxGCDCImpl::ComputeScaleAndOrigin() current affine transformation matrix (applied with SetTransformMatrix, ResetTransformMatrix) has to be concatenated with current basic transformations (applied with SetDeviceOrigin, SetLogicalScale, etc.).

Closes #17674.
This commit is contained in:
Artur Wieczorek
2016-09-20 21:20:45 +02:00
parent 27627db87d
commit 41a2b3e371
3 changed files with 22 additions and 20 deletions

View File

@@ -219,6 +219,9 @@ protected:
bool m_logicalFunctionSupported;
wxGraphicsMatrix m_matrixOriginal;
wxGraphicsMatrix m_matrixCurrent;
#if wxUSE_DC_TRANSFORM_MATRIX
wxAffineMatrix2D m_matrixExtTransform;
#endif // wxUSE_DC_TRANSFORM_MATRIX
double m_formerScaleX, m_formerScaleY;