Fix drawing of scaled bitmaps in wxCairoContext.
We must offset the coordinate system before scaling it, otherwise incorrect offset is used. Add a test for drawing translated/scaled bitmaps to the drawing sample. See #11097. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1471,10 +1471,10 @@ void wxCairoContext::DrawBitmap(const wxGraphicsBitmap &bmp, wxDouble x, wxDoubl
|
||||
|
||||
wxDouble scaleX = w / size.GetWidth();
|
||||
wxDouble scaleY = h / size.GetHeight();
|
||||
cairo_scale(m_context, scaleX, scaleY);
|
||||
|
||||
// prepare to draw the image
|
||||
cairo_translate(m_context, x, y);
|
||||
cairo_scale(m_context, scaleX, scaleY);
|
||||
cairo_set_source(m_context, pattern);
|
||||
// use the original size here since the context is scaled already...
|
||||
cairo_rectangle(m_context, 0, 0, size.GetWidth(), size.GetHeight());
|
||||
|
Reference in New Issue
Block a user