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

improve best size calculation; notably account for wxDP_ALLOWNONE

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54928 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-08-02 17:50:16 +00:00
parent ad63992e0f
commit 8a18ea3f03
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/msw/datectrl.cpp
View File

@@ -31,6 +31,7 @@
#include "wx/app.h" #include "wx/app.h"
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/dcclient.h" #include "wx/dcclient.h"
#include "wx/settings.h"
#include "wx/msw/private.h" #include "wx/msw/private.h"
#endif #endif
@@ -124,7 +125,6 @@ WXDWORD wxDatePickerCtrl::MSWGetStyle(long style, WXDWORD *exstyle) const
wxSize wxDatePickerCtrl::DoGetBestSize() const wxSize wxDatePickerCtrl::DoGetBestSize() const
{ {
wxClientDC dc(wx_const_cast(wxDatePickerCtrl *, this)); wxClientDC dc(wx_const_cast(wxDatePickerCtrl *, this));
dc.SetFont(GetFont());
// we can't use FormatDate() here as the CRT doesn't always use the same // we can't use FormatDate() here as the CRT doesn't always use the same
// format as the date picker control // format as the date picker control
@@ -156,13 +156,23 @@ wxSize wxDatePickerCtrl::DoGetBestSize() const
} }
} }
// the control adds a lot of extra space around separators // the best size for the control is bigger than just the string
s.Replace(_T(","), _T(" , ")); // representation of todays date because the control must accommodate any
// date and while the widths of all digits are usually about the same, the
// width of the month string varies a lot, so try to account for it
s += _T("WW");
int x, y; int x, y;
dc.GetTextExtent(s, &x, &y); dc.GetTextExtent(s, &x, &y);
wxSize best(x + 40 /* margin + arrows */, EDIT_HEIGHT_FROM_CHAR_HEIGHT(y)); // account for the drop-down arrow or spin arrows
x += wxSystemSettings::GetMetric(wxSYS_HSCROLL_ARROW_X);
// and for the checkbox if we have it
if ( HasFlag(wxDP_ALLOWNONE) )
x += 3*GetCharWidth();
wxSize best(x, EDIT_HEIGHT_FROM_CHAR_HEIGHT(y));
CacheBestSize(best); CacheBestSize(best);
return best; return best;
} }