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

Correctly determine best wxPropertyGrid width.

Browse Source 
Improve wxPropertyGrid::DoGetBestSize() to correctly determine the window
width by using the sum of columns widths.

Also correct wxPropertyGridPageState::GetColumnFitWidth() to account for the
bitmaps.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-08-31 21:28:25 +00:00
parent a4dac1907b
commit 890defb4f3
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/propgrid/propgrid.cpp
View File

@@ -1130,7 +1130,15 @@ wxSize wxPropertyGrid::DoGetBestSize() const
10 10
); );
const wxSize sz = wxSize(60, lineHeight*numLines + 40); wxClientDC dc(const_cast<wxPropertyGrid *>(this));
int width = m_marginWidth;
for ( unsigned int i = 0; i < m_pState->m_colWidths.size(); i++ )
{
width += m_pState->GetColumnFitWidth(dc, m_pState->DoGetRoot(), i, true);
}
const wxSize sz = wxSize(width, lineHeight*numLines + 40);
CacheBestSize(sz); CacheBestSize(sz);
return sz; return sz;
} }

6
src/propgrid/propgridpagestate.cpp
View File

@@ -768,8 +768,10 @@ int wxPropertyGridPageState::GetColumnFitWidth(wxClientDC& dc,
if ( col == 0 ) if ( col == 0 )
w += ( ((int)p->m_depth-1) * pg->m_subgroup_extramargin ); w += ( ((int)p->m_depth-1) * pg->m_subgroup_extramargin );
// // account for the bitmap
// TODO: Add bitmap support. if ( col == 1 )
w += p->GetImageOffset(pg->GetImageRect(p, -1).GetWidth());
w += (wxPG_XBEFORETEXT*2); w += (wxPG_XBEFORETEXT*2);