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

Improved readability of font changes to wxRendererMSW::GetCheckBoxSize and no longer force the window to redraw.

Browse Source
This commit is contained in:
Steve Browne
2015-11-24 19:44:26 -05:00
parent 8ede2351cc
commit 8f92be3c6b
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/msw/renderer.cpp
View File

@@ -604,10 +604,13 @@ int wxRendererMSW::GetHeaderButtonHeight(wxWindow * win)
wxON_BLOCK_EXIT1( ::DestroyWindow, hwndHeader ); wxON_BLOCK_EXIT1( ::DestroyWindow, hwndHeader );
// Must ensure the proper font is set or the wrong value will be returned // Set the font, even if it's the default one, before measuring the window.
// At 200% scaling it was returning a height of 28 when it should have been 40 wxFont font;
WXHANDLE hFont = (win && win->GetFont().IsOk() ? win->GetFont() : wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)).GetResourceHandle(); if ( win )
::SendMessage(hwndHeader, WM_SETFONT, (WPARAM)hFont, MAKELPARAM(TRUE, 0)); font = win->GetFont();
if ( !font.IsOk() )
wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
::SendMessage(hwndHeader, WM_SETFONT, (WPARAM)GetHfontOf(font), 0);
// initialize the struct filled with the values by Header_Layout() // initialize the struct filled with the values by Header_Layout()
RECT parentRect = { 0, 0, 100, 100 }; RECT parentRect = { 0, 0, 100, 100 };