Use a more accurate size for wxTimePickerCtrlGeneric

See #19078
This commit is contained in:
Paul Cornett
2021-02-23 23:12:43 -08:00
parent 2689040769
commit f25d48fbd5

View File

@@ -665,8 +665,14 @@ wxSize wxTimePickerCtrlGeneric::DoGetBestSize() const
if ( !m_impl )
return Base::DoGetBestSize();
wxSize size = m_impl->m_text->GetBestSize();
size.x += m_impl->m_btn->GetBestSize().x + HMARGIN_TEXT_SPIN;
wxTextCtrl* const text = m_impl->m_text;
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;
}