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

Fix wxGraphicsMatrix::TransformDistance for Direct2D implementation

Browse Source 
Current transformation matrix without translation component should be used in calculations.
This commit is contained in:
Artur Wieczorek
2016-08-21 21:01:52 +02:00
parent 6ca5c894cd
commit 78f00da98a
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@@ -120,6 +120,7 @@ wxMSW:
- Fix background colour returned by wxTextCtrl::GetStyle() (Andreas Falkenhahn). - Fix background colour returned by wxTextCtrl::GetStyle() (Andreas Falkenhahn).
- Revert to using equally-sized buttons in wxToolBar by default. - Revert to using equally-sized buttons in wxToolBar by default.
- Restore dispatching wxThreadEvent while resizing the window broken in 3.1.0. - Restore dispatching wxThreadEvent while resizing the window broken in 3.1.0.
- Fix wxGraphicsMatrix::TransformDistance for Direct2D renderer.
wxOSX: wxOSX:

2
src/msw/graphicsd2d.cpp
View File

@@ -979,7 +979,7 @@ void wxD2DMatrixData::TransformDistance(wxDouble* dx, wxDouble* dy) const
D2D1::Matrix3x2F noTranslationMatrix = m_matrix; D2D1::Matrix3x2F noTranslationMatrix = m_matrix;
noTranslationMatrix._31 = 0; noTranslationMatrix._31 = 0;
noTranslationMatrix._32 = 0; noTranslationMatrix._32 = 0;
D2D1_POINT_2F result = m_matrix.TransformPoint(D2D1::Point2F(*dx, *dy)); D2D1_POINT_2F result = noTranslationMatrix.TransformPoint(D2D1::Point2F(*dx, *dy));
*dx = result.x; *dx = result.x;
*dy = result.y; *dy = result.y;
} }