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

Merge branch 'textctrl-getsizefromtextsize'

Browse Source 
Improve wxTextCtrl and wxSpinCtrl sizing under macOS.

See https://github.com/wxWidgets/wxWidgets/pull/1861
This commit is contained in:
Vadim Zeitlin
2020-05-28 02:21:35 +02:00
parent 52eec83245 316bbd2189
commit 27495c5484
3 changed files with 41 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/generic/spinctlg.cpp
View File

@@ -296,21 +296,12 @@ wxSize wxSpinCtrlGenericBase::DoGetBestSize() const
wxSize wxSpinCtrlGenericBase::DoGetSizeFromTextSize(int xlen, int ylen) const
{
wxSize sizeBtn = m_spinButton->GetBestSize();
wxSize totalS( m_textCtrl->GetBestSize() );
const wxSize sizeBtn = m_spinButton->GetBestSize();
const wxSize sizeText = m_textCtrl->GetSizeFromTextSize(xlen, ylen);
wxSize tsize(xlen + sizeBtn.x + MARGIN, totalS.y);
#if defined(__WXMSW__)
tsize.IncBy(4*totalS.y/10 + 4, 0);
#elif defined(__WXGTK__)
tsize.IncBy(totalS.y + 10, 0);
#endif // MSW GTK
// Check if the user requested a non-standard height.
if ( ylen > 0 )
tsize.IncBy(0, ylen - GetCharHeight());
return tsize;
// Note that we don't use the button height here, as it can be
// much greater than that of a text control that we want to resemble.
return wxSize(sizeText.x + sizeBtn.x + MARGIN, sizeText.y);
}
void wxSpinCtrlGenericBase::DoMoveWindow(int x, int y, int width, int height)