solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Fix wxBufferedPaintDC scale in wxRichTextCtrl

Browse source 
Use wxBitmap::CreateWithDIPSize() to ensure that the backing store
bitmap uses the scale factor corresponding to wxRichTextCtrl using it.

This fixes layout problems in wxRichTextCtrl when using non-default DPI.

Closes #23828.

Closes #23861.
This commit is contained in:
Maarten Bent 2023-09-09 14:36:32 +02:00 • committed by Vadim Zeitlin
parent 5c86933fd3
commit c472e495fa
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/richtext/richtextctrl.cpp
View file

@ -3021,15 +3021,17 @@ bool wxRichTextCtrl::RecreateBuffer(const wxSize& size)
if (sz.x < 1 || sz.y < 1)
return false;
if (!m_bufferBitmap.IsOk() || m_bufferBitmap.GetWidth() < sz.x || m_bufferBitmap.GetHeight() < sz.y)
if (!m_bufferBitmap.IsOk() || m_bufferBitmap.GetLogicalWidth() < sz.x || m_bufferBitmap.GetLogicalHeight() < sz.y)
{
// As per https://github.com/wxWidgets/wxWidgets/issues/14403, prevent very inefficient fix to alpha bits of
// destination by making the backing bitmap 24-bit. Note that using 24-bit depth breaks painting of
// scrolled areas on wxWidgets 2.8.
#if defined(__WXMSW__) && wxCHECK_VERSION(3,0,0)
m_bufferBitmap = wxBitmap(sz.x, sz.y, 24);
#else
m_bufferBitmap = wxBitmap(sz.x, sz.y);
int depth = -1;
#if defined(__WXMSW__)
depth = 24;
#endif
m_bufferBitmap.CreateWithDIPSize(sz, GetDPIScaleFactor(), depth);
}
return m_bufferBitmap.IsOk();
}
#endif