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

Fixed tree book controller sizing by invalidating size after first

Browse Source 
insertion, and also allowing full size calculation.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39207 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2006-05-18 09:33:17 +00:00
parent acead93d81
commit 7c3840677c
3 changed files with 53 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/common/treebase.cpp
View File

@@ -92,6 +92,27 @@ wxTreeCtrlBase::~wxTreeCtrlBase()
delete m_imageListState;
}
static void wxGetBestTreeSize(const wxTreeCtrlBase* treeCtrl, const wxTreeItemId& id, wxSize& size)
{
wxRect rect;
if ( treeCtrl->GetBoundingRect(id, rect, true) )
{
if ( size.x < rect.x + rect.width )
size.x = rect.x + rect.width;
if ( size.y < rect.y + rect.height )
size.y = rect.y + rect.height;
}
wxTreeItemIdValue cookie;
for ( wxTreeItemId item = treeCtrl->GetFirstChild(id, cookie);
item.IsOk();
item = treeCtrl->GetNextChild(item, cookie) )
{
wxGetBestTreeSize(treeCtrl, item, size);
}
}
wxSize wxTreeCtrlBase::DoGetBestSize() const
{
wxSize size;
@@ -99,23 +120,29 @@ wxSize wxTreeCtrlBase::DoGetBestSize() const
// this doesn't really compute the total bounding rectangle of all items
// but a not too bad guess of it which has the advantage of not having to
// examine all (potentially hundreds or thousands) items in the control
for ( wxTreeItemId item = GetRootItem();
item.IsOk();
item = GetLastChild(item) )
if (GetQuickBestSize())
{
wxRect rect;
// last parameter is "true" to get only the dimensions of the text
// label, we don't want to get the entire item width as it's determined
// by the current size
if ( GetBoundingRect(item, rect, true) )
for ( wxTreeItemId item = GetRootItem();
item.IsOk();
item = GetLastChild(item) )
{
if ( size.x < rect.x + rect.width )
size.x = rect.x + rect.width;
if ( size.y < rect.y + rect.height )
size.y = rect.y + rect.height;
wxRect rect;
// last parameter is "true" to get only the dimensions of the text
// label, we don't want to get the entire item width as it's determined
// by the current size
if ( GetBoundingRect(item, rect, true) )
{
if ( size.x < rect.x + rect.width )
size.x = rect.x + rect.width;
if ( size.y < rect.y + rect.height )
size.y = rect.y + rect.height;
}
}
}
else
wxGetBestTreeSize(this, GetRootItem(), size);
// need some minimal size even for empty tree
if ( !size.x || !size.y )