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

wxaui maximize bug fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Benjamin Williams
2006-11-02 20:50:01 +00:00
parent 2613e24d5d
commit 46067c3515
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/aui/framemanager.cpp
View File

@@ -799,6 +799,10 @@ bool wxAuiManager::AddPane(wxWindow* window, const wxAuiPaneInfo& pane_info)
if (GetPane(pane_info.window).IsOk()) if (GetPane(pane_info.window).IsOk())
return false; return false;
// if the new pane is docked then we should undo maximize
if(pane_info.IsDocked())
RestoreMaximizedPane();
m_panes.Add(pane_info); m_panes.Add(pane_info);
wxAuiPaneInfo& pinfo = m_panes.Last(); wxAuiPaneInfo& pinfo = m_panes.Last();
@@ -946,6 +950,9 @@ bool wxAuiManager::InsertPane(wxWindow* window, const wxAuiPaneInfo& pane_info,
} }
else else
{ {
// if the new pane is docked then we should undo maximize
RestoreMaximizedPane();
existing_pane.Direction(pane_info.dock_direction); existing_pane.Direction(pane_info.dock_direction);
existing_pane.Layer(pane_info.dock_layer); existing_pane.Layer(pane_info.dock_layer);
existing_pane.Row(pane_info.dock_row); existing_pane.Row(pane_info.dock_row);
@@ -3545,12 +3552,12 @@ void wxAuiManager::OnLeftDown(wxMouseEvent& event)
wxAuiDockUIPart* part = HitTest(event.GetX(), event.GetY()); wxAuiDockUIPart* part = HitTest(event.GetX(), event.GetY());
if (part) if (part)
{ {
if (part->dock && part->dock->dock_direction == wxAUI_DOCK_CENTER)
return;
if (part->type == wxAuiDockUIPart::typeDockSizer || if (part->type == wxAuiDockUIPart::typeDockSizer ||
part->type == wxAuiDockUIPart::typePaneSizer) part->type == wxAuiDockUIPart::typePaneSizer)
{ {
if (part->dock && part->dock->dock_direction == wxAUI_DOCK_CENTER)
return;
// a dock may not be resized if it has a single // a dock may not be resized if it has a single
// pane which is not resizable // pane which is not resizable
if (part->type == wxAuiDockUIPart::typeDockSizer && part->dock && if (part->type == wxAuiDockUIPart::typeDockSizer && part->dock &&
@@ -3582,6 +3589,9 @@ void wxAuiManager::OnLeftDown(wxMouseEvent& event)
else if (part->type == wxAuiDockUIPart::typeCaption || else if (part->type == wxAuiDockUIPart::typeCaption ||
part->type == wxAuiDockUIPart::typeGripper) part->type == wxAuiDockUIPart::typeGripper)
{ {
if (part->dock && part->dock->dock_direction == wxAUI_DOCK_CENTER)
return;
if (GetFlags() & wxAUI_MGR_ALLOW_ACTIVE_PANE) if (GetFlags() & wxAUI_MGR_ALLOW_ACTIVE_PANE)
{ {
// set the caption as active // set the caption as active