Fixed tree book controller sizing by invalidating size after first

insertion, and also allowing full size calculation.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39207 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/treectrl.h

@@ -42,6 +42,9 @@ public:
 
         // arbitrary default
         m_spacing = 18;
+
+        // quick DoGetBestSize calculation
+        m_quickBestSize = true;
     }
 
     virtual ~wxTreeCtrlBase();
@@ -366,6 +369,10 @@ public:
 
     virtual bool ShouldInheritColours() const { return false; }
 
+    // hint whether to calculate best size quickly or accurately
+    void SetQuickBestSize(bool q) { m_quickBestSize = q; }
+    bool GetQuickBestSize() const { return m_quickBestSize; }
+
 protected:
     virtual wxSize DoGetBestSize() const;
 
@@ -402,6 +409,9 @@ protected:
     // spacing between left border and the text
     unsigned int m_spacing;
 
+    // whether full or quick calculation is done in DoGetBestSize
+    bool        m_quickBestSize;
+
 
     DECLARE_NO_COPY_CLASS(wxTreeCtrlBase)
 };

src/common/treebase.cpp

@@ -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,6 +120,9 @@ 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
+    
+    if (GetQuickBestSize())
+    {
         for ( wxTreeItemId item = GetRootItem();
               item.IsOk();
               item = GetLastChild(item) )
@@ -116,6 +140,9 @@ wxSize wxTreeCtrlBase::DoGetBestSize() const
                     size.y = rect.y + rect.height;
             }
         }
+    }
+    else
+        wxGetBestTreeSize(this, GetRootItem(), size);
 
     // need some minimal size even for empty tree
     if ( !size.x || !size.y )

src/generic/treebkg.cpp

@@ -105,6 +105,7 @@ wxTreebook::Create(wxWindow *parent,
                     wxTR_HIDE_ROOT |
                     wxTR_SINGLE
                  );
+    GetTreeCtrl()->SetQuickBestSize(false); // do full size calculation
     GetTreeCtrl()->AddRoot(wxEmptyString); // label doesn't matter, it's hidden
 
 #ifdef __WXMSW__
@@ -244,6 +245,8 @@ bool wxTreebook::DoInsertSubPage(size_t pagePos,
 
     wxTreeItemId newId = tree->AppendItem(parentId, text, imageId);
 
+    tree->InvalidateBestSize();
+
     if ( !newId.IsOk() )
     {
         (void)wxBookCtrlBase::DoRemovePage(newPos);