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

Reuse wxButton::GetDefaultSize() instead of duplicating it

Browse source 
Just reuse the existing function in IncreaseToStdSizeAndCache() helper
instead of using a separate and, until the parent commit, different, way
of computing the default button size here.

This will hopefully avoid introducing any discrepancies between the size
returned by GetDefaultSize() and the size actually used for the buttons
by default in the future.

See #24283.
This commit is contained in:
Vadim Zeitlin 2024-02-05 19:05:02 +01:00
parent 57b408ed88
commit be5fa77839
1 changed files with 1 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/msw/anybutton.cpp
View file

@ -546,17 +546,7 @@ wxSize wxMSWButton::IncreaseToStdSizeAndCache(wxControl *btn, const wxSize& size
// By default all buttons have at least the standard size.
if ( !btn->HasFlag(wxBU_EXACTFIT) )
{
// The "Recommended sizing and spacing" section of MSDN layout article
// documents the default button size as being 50*14 dialog units or
// 75*23 relative pixels (what we call DIPs). As dialog units don't
// scale well in high DPI because of rounding errors, just DIPs here.
//
// Moreover, it looks like the extra 2px borders around the visible
// part of the button are not scaled correctly in higher than normal
// DPI, so add them without scaling.
const wxSize sizeDef = btn->FromDIP(wxSize(73, 21)) + wxSize(2, 2);
sizeBtn.IncTo(sizeDef);
sizeBtn.IncTo(wxButton::GetDefaultSize(btn));
}
// wxBU_EXACTFIT is typically used alongside a text control or similar,