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

Improve default size calc of wxComboBox

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53253 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2008-04-18 07:57:03 +00:00
parent e38ce1bcbf
commit d1b190d435
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gtk/combobox.cpp
View File

@@ -431,25 +431,27 @@ GdkWindow *wxComboBox::GTKGetWindow(wxArrayGdkWindows& windows) const
wxSize wxComboBox::DoGetBestSize() const wxSize wxComboBox::DoGetBestSize() const
{ {
// strangely, this returns a width of 188 pixels from GTK+ (?)
wxSize ret( wxControl::DoGetBestSize() ); wxSize ret( wxControl::DoGetBestSize() );
// we know better our horizontal extent: it depends on the longest string // we know better our horizontal extent: it depends on the longest string
// in the combobox // in the combobox
if ( m_widget ) if ( m_widget )
{ {
ret.x = 60; // start with something "sensible"
int width; int width;
unsigned int count = GetCount(); unsigned int count = GetCount();
for ( unsigned int n = 0; n < count; n++ ) for ( unsigned int n = 0; n < count; n++ )
{ {
GetTextExtent(GetString(n), &width, NULL, NULL, NULL ); GetTextExtent(GetString(n), &width, NULL, NULL, NULL );
if ( width > ret.x ) if ( width + 40 > ret.x ) // 40 for drop down arrow and space around text
ret.x = width; ret.x = width + 40;
} }
} }
// empty combobox should have some reasonable default size too // empty combobox should have some reasonable default size too
if ( ret.x < 100 ) if ((GetCount() == 0) && (ret.x < 80))
ret.x = 100; ret.x = 80;
CacheBestSize(ret); CacheBestSize(ret);
return ret; return ret;