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

Improve handling of non default DPI in wxHtmlWindow deawing code

Browse Source 
This replaces the fix of f4dcac9f44 (Return wxFont adjusted to DPI in
wxHtmlWinParser::CreateCurrentFont(), 2020-11-25) adjusting the font
explicitly under MSW with a better fix, associating the correct window
(and hence DPI) with the device context used in OnPaint().

See #18564.
This commit is contained in:
Maarten Bent
2020-11-28 16:56:10 +01:00
committed by Vadim Zeitlin
parent ef9161861d
commit 39ca664053
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/html/htmlwin.cpp
View File

@@ -1116,6 +1116,7 @@ void wxHtmlWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
dc = &dcm; dc = &dcm;
} }
dc->GetImpl()->SetWindow(this);
PrepareDC(*dc); PrepareDC(*dc);
// Erase the background: for compatibility, we must generate the event to // Erase the background: for compatibility, we must generate the event to

4
src/html/winpars.cpp
View File

@@ -619,10 +619,6 @@ wxFont* wxHtmlWinParser::CreateCurrentFont()
*encptr = m_OutputEnc; *encptr = m_OutputEnc;
#endif #endif
} }
#ifdef __WXMSW__
if ( m_windowInterface && m_windowInterface->GetHTMLWindow() )
(*fontptr)->WXAdjustToPPI(m_windowInterface->GetHTMLWindow()->GetDPI());
#endif
m_DC->SetFont(**fontptr); m_DC->SetFont(**fontptr);
return (*fontptr); return (*fontptr);
} }