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

Use a more accurate size for wxTimePickerCtrlGeneric

Browse Source 
See #19078
This commit is contained in:
Paul Cornett
2021-02-23 23:12:43 -08:00
parent 2689040769
commit f25d48fbd5
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/generic/timectrlg.cpp
View File

@@ -665,8 +665,14 @@ wxSize wxTimePickerCtrlGeneric::DoGetBestSize() const
if ( !m_impl ) if ( !m_impl )
return Base::DoGetBestSize(); return Base::DoGetBestSize();
wxSize size = m_impl->m_text->GetBestSize(); wxTextCtrl* const text = m_impl->m_text;
size.x += m_impl->m_btn->GetBestSize().x + HMARGIN_TEXT_SPIN; int w;
text->GetTextExtent(text->GetValue(), &w, NULL);
wxSize size(text->GetSizeFromTextSize(w + 1));
const wxSize sizeBtn(m_impl->m_btn->GetBestSize());
size.y = wxMax(size.y, sizeBtn.y);
size.x += sizeBtn.x + HMARGIN_TEXT_SPIN;
return size; return size;
} }