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

Use a more accurate width for wxDatePickerCtrlGeneric

Browse Source 
See #19078
This commit is contained in:
Paul Cornett 2021-02-23 10:01:01 -08:00
parent 06bb60f0f8
commit 1508fa1e4c
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/generic/datectlg.cpp
View File

@ -409,17 +409,12 @@ bool wxDatePickerCtrlGeneric::Destroy()
wxSize wxDatePickerCtrlGeneric::DoGetBestSize() const
{
// A better solution would be to use a custom text control that would have
// the best size determined by the current date format and let m_combo take
// care of the best size computation, but this isn't easily possible with
// wxComboCtrl currently, so we compute our own best size here instead even
// if this means adding some extra margins to account for text control
// borders, space between it and the button and so on.
wxSize size = m_combo->GetButtonSize();
wxTextCtrl* const text = m_combo->GetTextCtrl();
size.x += text->GetTextExtent(text->GetValue()).x;
size.x += 2*text->GetCharWidth(); // This is the margin mentioned above.
int w;
text->GetTextExtent(text->GetValue(), &w, NULL);
size.x += text->GetSizeFromTextSize(w + 1).x;
return size;
}