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

Merge branch 'd2d-drawbitmap' of https://github.com/MaartenBent/wxWidgets

Browse Source 
Fix DrawBitmap() in Direct2D renderer to resize the bitmap if necessary.

See https://github.com/wxWidgets/wxWidgets/pull/1752
This commit is contained in:
Vadim Zeitlin
2020-03-11 23:20:56 +01:00
parent f9b793f8d1 977e9df630
commit 13b6b9ef18
2 changed files with 151 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/msw/graphicsd2d.cpp
View File

@@ -3182,17 +3182,17 @@ public:
// The default implementation works for all render targets, but the D2D 1.0
// render target holders shouldn't need to override it, since none of the
// 1.0 render targets offer a better version of this method.
virtual void DrawBitmap(ID2D1Bitmap* bitmap, D2D1_POINT_2F offset,
D2D1_RECT_F imageRectangle, wxInterpolationQuality interpolationQuality,
virtual void DrawBitmap(ID2D1Bitmap* bitmap,
const D2D1_RECT_F& srcRect, const D2D1_RECT_F& destRect,
wxInterpolationQuality interpolationQuality,
wxCompositionMode WXUNUSED(compositionMode))
{
D2D1_RECT_F destinationRectangle = D2D1::RectF(offset.x, offset.y, offset.x + imageRectangle.right, offset.y + imageRectangle.bottom);
m_nativeResource->DrawBitmap(
bitmap,
destinationRectangle,
destRect,
1.0f,
wxD2DConvertBitmapInterpolationMode(interpolationQuality),
imageRectangle);
srcRect);
}
// We use this method instead of the one provided by the native render target
@@ -3477,13 +3477,15 @@ public:
wxCHECK_HRESULT_RET(hr);
}
void DrawBitmap(ID2D1Bitmap* image, D2D1_POINT_2F offset,
D2D1_RECT_F imageRectangle, wxInterpolationQuality interpolationQuality,
void DrawBitmap(ID2D1Bitmap* bitmap,
const D2D1_RECT_F& srcRect, const D2D1_RECT_F& destRect,
wxInterpolationQuality interpolationQuality,
wxCompositionMode compositionMode) wxOVERRIDE
{
m_context->DrawImage(image,
D2D1_POINT_2F offset = D2D1::Point2(destRect.left, destRect.top);
m_context->DrawImage(bitmap,
offset,
imageRectangle,
srcRect,
wxD2DConvertInterpolationMode(interpolationQuality),
wxD2DConvertCompositionMode(compositionMode));
}
@@ -4484,11 +4486,12 @@ void wxD2DContext::DrawBitmap(const wxGraphicsBitmap& bmp, wxDouble x, wxDouble
wxD2DBitmapData* bitmapData = wxGetD2DBitmapData(bmp);
bitmapData->Bind(this);
D2D1_SIZE_F imgSize = bitmapData->GetD2DBitmap()->GetSize();
m_renderTargetHolder->DrawBitmap(
bitmapData->GetD2DBitmap(),
D2D1::Point2F(x, y),
D2D1::RectF(0, 0, w, h),
D2D1::RectF(0, 0, imgSize.width, imgSize.height),
D2D1::RectF(x, y, x + w, y + h),
GetInterpolationQuality(),
GetCompositionMode());
}