wxAUI: maintain minimum size of panes across dock/undock.

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

diff --git a/src/aui/floatpane.cpp b/src/aui/floatpane.cpp
index 81df0b742236dcaa06e87f33087438a08369ef58..0e0c1143eb2630e9ef20d044801a8caf138bf7ed 100644 (file)
--- a/src/aui/floatpane.cpp
+++ b/src/aui/floatpane.cpp
@@ -69,6 +69,9 @@ void wxFloatingPane::SetPaneWindow(const wxPaneInfo& pane)
                     PaneBorder(false).
                     Layer(0).Row(0).Position(0);
 
+    // Carry over the minimum size
+    SetMinSize(pane.window->GetMinSize());
+
     m_mgr.AddPane(m_pane_window, contained_pane);
     m_mgr.Update();
 

diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp
index 55933e04f00c80f39d523b1980ba66a144f295c9..94dbf0b22aa119d6a9c9071447e2aa0d1e36003e 100644 (file)
--- a/src/aui/framemanager.cpp
+++ b/src/aui/framemanager.cpp
@@ -1158,7 +1158,8 @@ void wxFrameManager::LayoutAddPane(wxSizer* cont,
     else
     {
         sizer_item = vert_pane_sizer->Add(pane.window, 1, wxEXPAND);
-        vert_pane_sizer->SetItemMinSize(pane.window, 1, 1);
+        // Don't do this because it breaks the pane size in floating windows
+        // vert_pane_sizer->SetItemMinSize(pane.window, 1, 1);
     }
 
     part.type = wxDockUIPart::typePane;