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

Preserve wxBitmap scaling in Blit() with wxMemoryDC on GTK3

Browse Source 
See #18857
This commit is contained in:
Paul Cornett
2020-07-28 00:03:15 -07:00
parent 8df97af5fe
commit 2b9499d7a7
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gtk/dc.cpp
View File

@@ -187,7 +187,13 @@ bool wxGTKCairoDCImpl::DoStretchBlit(int xdest, int ydest, int dstWidth, int dst
cairo_rectangle(cr, 0, 0, dstWidth, dstHeight); cairo_rectangle(cr, 0, 0, dstWidth, dstHeight);
double sx, sy; double sx, sy;
source->GetUserScale(&sx, &sy); source->GetUserScale(&sx, &sy);
cairo_scale(cr, dstWidth / (sx * srcWidth), dstHeight / (sy * srcHeight));
const wxBitmap& bitmap = source->GetImpl()->GetSelectedBitmap();
double bmpScale = bitmap.IsOk() ? bitmap.GetScaleFactor() : 1.0;
if (GetSelectedBitmap().IsOk())
bmpScale /= m_contentScaleFactor;
cairo_scale(cr, dstWidth / (sx * srcWidth * bmpScale), dstHeight / (sy * srcHeight * bmpScale));
cairo_set_source_surface(cr, surfaceSrc, -xsrc_dev, -ysrc_dev); cairo_set_source_surface(cr, surfaceSrc, -xsrc_dev, -ysrc_dev);
const wxRasterOperationMode rop_save = m_logicalFunction; const wxRasterOperationMode rop_save = m_logicalFunction;
SetLogicalFunction(rop); SetLogicalFunction(rop);
@@ -195,7 +201,6 @@ bool wxGTKCairoDCImpl::DoStretchBlit(int xdest, int ydest, int dstWidth, int dst
cairo_surface_t* maskSurf = NULL; cairo_surface_t* maskSurf = NULL;
if (useMask) if (useMask)
{ {
const wxBitmap& bitmap = source->GetImpl()->GetSelectedBitmap();
if (bitmap.IsOk()) if (bitmap.IsOk())
{ {
wxMask* mask = bitmap.GetMask(); wxMask* mask = bitmap.GetMask();