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

Fix drawing of scaled bitmaps in wxCairoContext.

Browse Source 
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:
Vadim Zeitlin
2010-06-02 11:58:25 +00:00
parent 5db56cd2e7
commit ce6b1014bf
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
samples/drawing/drawing.cpp
View File

@@ -1052,8 +1052,15 @@ void MyCanvas::DrawGraphics(wxGraphicsContext* gc)
gc->PopState(); gc->PopState();
} }
gc->PopState(); gc->PopState();
gc->PushState();
gc->Translate(60, 400);
gc->DrawText("Scaled smiley inside a square", 0, 0);
gc->DrawRectangle(BASE2, BASE2, 100, 100);
gc->DrawBitmap(m_smile_bmp, BASE2, BASE2, 100, 100);
gc->PopState();
} }
#endif #endif // wxUSE_GRAPHICS_CONTEXT
void MyCanvas::DrawCircles(wxDC& dc) void MyCanvas::DrawCircles(wxDC& dc)
{ {

2
src/generic/graphicc.cpp
View File

@@ -1471,10 +1471,10 @@ void wxCairoContext::DrawBitmap(const wxGraphicsBitmap &bmp, wxDouble x, wxDoubl
wxDouble scaleX = w / size.GetWidth(); wxDouble scaleX = w / size.GetWidth();
wxDouble scaleY = h / size.GetHeight(); wxDouble scaleY = h / size.GetHeight();
cairo_scale(m_context, scaleX, scaleY);
// prepare to draw the image // prepare to draw the image
cairo_translate(m_context, x, y); cairo_translate(m_context, x, y);
cairo_scale(m_context, scaleX, scaleY);
cairo_set_source(m_context, pattern); cairo_set_source(m_context, pattern);
// use the original size here since the context is scaled already... // use the original size here since the context is scaled already...
cairo_rectangle(m_context, 0, 0, size.GetWidth(), size.GetHeight()); cairo_rectangle(m_context, 0, 0, size.GetWidth(), size.GetHeight());