X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4dc79cfb52a2548139629daaa4d1e83da28568dc..fcdd53359135f790b85728c4254b97095a56dad8:/src/aui/framemanager.cpp diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp index c9f1d7b583..4c7d3831c3 100644 --- a/src/aui/framemanager.cpp +++ b/src/aui/framemanager.cpp @@ -28,6 +28,8 @@ #include "wx/aui/framemanager.h" #include "wx/aui/dockart.h" #include "wx/aui/floatpane.h" +#include "wx/aui/tabmdi.h" +#include "wx/aui/auibar.h" #ifndef WX_PRECOMP #include "wx/panel.h" @@ -52,30 +54,34 @@ WX_DEFINE_OBJARRAY(wxAuiPaneInfoArray) wxAuiPaneInfo wxAuiNullPaneInfo; wxAuiDockInfo wxAuiNullDockInfo; -DEFINE_EVENT_TYPE(wxEVT_AUI_PANEBUTTON) -DEFINE_EVENT_TYPE(wxEVT_AUI_PANECLOSE) -DEFINE_EVENT_TYPE(wxEVT_AUI_PANEMAXIMIZE) -DEFINE_EVENT_TYPE(wxEVT_AUI_PANERESTORE) +DEFINE_EVENT_TYPE(wxEVT_AUI_PANE_BUTTON) +DEFINE_EVENT_TYPE(wxEVT_AUI_PANE_CLOSE) +DEFINE_EVENT_TYPE(wxEVT_AUI_PANE_MAXIMIZE) +DEFINE_EVENT_TYPE(wxEVT_AUI_PANE_RESTORE) DEFINE_EVENT_TYPE(wxEVT_AUI_RENDER) -DEFINE_EVENT_TYPE(wxEVT_AUI_FINDMANAGER) +DEFINE_EVENT_TYPE(wxEVT_AUI_FIND_MANAGER) #ifdef __WXMAC__ // a few defines to avoid nameclashes #define __MAC_OS_X_MEMORY_MANAGER_CLEAN__ 1 #define __AIFF__ - #include "wx/mac/private.h" + #include "wx/osx/private.h" +#endif + +#ifdef __WXMSW__ + #include "wx/msw/wrapwin.h" + #include "wx/msw/private.h" + #include "wx/msw/dc.h" #endif IMPLEMENT_DYNAMIC_CLASS(wxAuiManagerEvent, wxEvent) IMPLEMENT_CLASS(wxAuiManager, wxEvtHandler) -// private manager flags (not yet on the public API) -enum wxAuiPrivateManagerOption -{ - wxAUI_MGR_NO_DOCK_SIZE_LIMIT = 1 << 28 -}; +const int auiToolBarLayer = 10; + +#ifndef __WXGTK20__ class wxPseudoTransparentFrame : public wxFrame @@ -155,7 +161,7 @@ public: wxRect rect(upd.GetRect()); dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height); - upd++; + ++upd; } } @@ -212,6 +218,75 @@ BEGIN_EVENT_TABLE(wxPseudoTransparentFrame, wxFrame) END_EVENT_TABLE() +#else + // __WXGTK20__ + +#include + +static void +gtk_pseudo_window_realized_callback( GtkWidget *m_widget, void *WXUNUSED(win) ) +{ + wxSize disp = wxGetDisplaySize(); + int amount = 128; + wxRegion region; + for (int y=0; ywindow, region.GetRegion(), 0, 0); +} + + +class wxPseudoTransparentFrame: public wxFrame +{ +public: + wxPseudoTransparentFrame(wxWindow* parent = NULL, + wxWindowID id = wxID_ANY, + const wxString& title = wxEmptyString, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxDEFAULT_FRAME_STYLE, + const wxString &name = wxT("frame")) + { + if (!CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) + return; + + m_title = title; + + m_widget = gtk_window_new( GTK_WINDOW_POPUP ); + g_object_ref(m_widget); + + if (parent) parent->AddChild(this); + + g_signal_connect( m_widget, "realize", + G_CALLBACK (gtk_pseudo_window_realized_callback), this ); + + GdkColor col; + col.red = 128 * 256; + col.green = 192 * 256; + col.blue = 255 * 256; + gtk_widget_modify_bg( m_widget, GTK_STATE_NORMAL, &col ); + } + + bool SetTransparent(wxByte WXUNUSED(alpha)) + { + return true; + } + +private: + DECLARE_DYNAMIC_CLASS(wxPseudoTransparentFrame) +}; + +IMPLEMENT_DYNAMIC_CLASS(wxPseudoTransparentFrame, wxFrame) + +#endif + // __WXGTK20__ + + + // -- static utility functions -- static wxBitmap wxPaneCreateStippleBitmap() @@ -226,10 +301,15 @@ static void DrawResizeHint(wxDC& dc, const wxRect& rect) wxBitmap stipple = wxPaneCreateStippleBitmap(); wxBrush brush(stipple); dc.SetBrush(brush); +#ifdef __WXMSW__ + wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl(); + PatBlt(GetHdcOf(*impl), rect.GetX(), rect.GetY(), rect.GetWidth(), rect.GetHeight(), PATINVERT); +#else dc.SetPen(*wxTRANSPARENT_PEN); dc.SetLogicalFunction(wxXOR); dc.DrawRectangle(rect); +#endif } @@ -259,7 +339,8 @@ static void CopyDocksAndPanes(wxAuiDockInfoArray& dest_docks, // GetMaxLayer() is an internal function which returns // the highest layer inside the specified dock -static int GetMaxLayer(const wxAuiDockInfoArray& docks, int dock_direction) +static int GetMaxLayer(const wxAuiDockInfoArray& docks, + int dock_direction) { int i, dock_count, max_layer = 0; for (i = 0, dock_count = docks.GetCount(); i < dock_count; ++i) @@ -432,20 +513,26 @@ static void RemovePaneFromDocks(wxAuiDockInfoArray& docks, } } +/* +// This function works fine, and may be used in the future + // RenumberDockRows() takes a dock and assigns sequential numbers // to existing rows. Basically it takes out the gaps; so if a // dock has rows with numbers 0,2,5, they will become 0,1,2 static void RenumberDockRows(wxAuiDockInfoPtrArray& docks) { - int i, dock_count, j, pane_count; + int i, dock_count; for (i = 0, dock_count = docks.GetCount(); i < dock_count; ++i) { wxAuiDockInfo& dock = *docks.Item(i); dock.dock_row = i; + + int j, pane_count; for (j = 0, pane_count = dock.panes.GetCount(); j < pane_count; ++j) dock.panes.Item(j)->dock_row = i; } } +*/ // SetActivePane() sets the active pane, as well as cycles through @@ -475,7 +562,7 @@ static int PaneSortFunc(wxAuiPaneInfo** p1, wxAuiPaneInfo** p2) BEGIN_EVENT_TABLE(wxAuiManager, wxEvtHandler) - EVT_AUI_PANEBUTTON(wxAuiManager::OnPaneButton) + EVT_AUI_PANE_BUTTON(wxAuiManager::OnPaneButton) EVT_AUI_RENDER(wxAuiManager::OnRender) EVT_PAINT(wxAuiManager::OnPaint) EVT_ERASE_BACKGROUND(wxAuiManager::OnEraseBackground) @@ -485,8 +572,9 @@ BEGIN_EVENT_TABLE(wxAuiManager, wxEvtHandler) EVT_LEFT_UP(wxAuiManager::OnLeftUp) EVT_MOTION(wxAuiManager::OnMotion) EVT_LEAVE_WINDOW(wxAuiManager::OnLeaveWindow) + EVT_MOUSE_CAPTURE_LOST(wxAuiManager::OnCaptureLost) EVT_CHILD_FOCUS(wxAuiManager::OnChildFocus) - EVT_AUI_FINDMANAGER(wxAuiManager::OnFindManager) + EVT_AUI_FIND_MANAGER(wxAuiManager::OnFindManager) EVT_TIMER(101, wxAuiManager::OnHintFadeTimer) END_EVENT_TABLE() @@ -502,7 +590,10 @@ wxAuiManager::wxAuiManager(wxWindow* managed_wnd, unsigned int flags) m_skipping = false; m_has_maximized = false; m_frame = NULL; - + m_dock_constraint_x = 0.3; + m_dock_constraint_y = 0.3; + m_reserved = NULL; + if (managed_wnd) { SetManagedWindow(managed_wnd); @@ -511,13 +602,34 @@ wxAuiManager::wxAuiManager(wxWindow* managed_wnd, unsigned int flags) wxAuiManager::~wxAuiManager() { + // NOTE: It's possible that the windows have already been destroyed by the + // time this dtor is called, so this loop can result in memory access via + // invalid pointers, resulting in a crash. So it will be disabled while + // waiting for a better solution. +#if 0 + for ( size_t i = 0; i < m_panes.size(); i++ ) + { + wxAuiPaneInfo& pinfo = m_panes[i]; + if (pinfo.window && !pinfo.window->GetParent()) + delete pinfo.window; + } +#endif + delete m_art; } -// Creates a floating frame for the windows -wxAuiFloatingFrame * wxAuiManager::CreateFloatingFrame(wxWindow* parent, const wxAuiPaneInfo& p) +// creates a floating frame for the windows +wxAuiFloatingFrame* wxAuiManager::CreateFloatingFrame(wxWindow* parent, + const wxAuiPaneInfo& pane_info) +{ + return new wxAuiFloatingFrame(parent, this, pane_info); +} + +bool wxAuiManager::CanDockPanel(const wxAuiPaneInfo & WXUNUSED(p)) { - return new wxAuiFloatingFrame(parent, this, p); + // if a key modifier is pressed while dragging the frame, + // don't dock the window + return !(wxGetKeyState(WXK_CONTROL) || wxGetKeyState(WXK_ALT)); } // GetPane() looks up a wxAuiPaneInfo structure based @@ -611,7 +723,7 @@ void wxAuiManager::SetFlags(unsigned int flags) // set the new flags m_flags = flags; - + if (update_hint_wnd) { UpdateHintWindowConfig(); @@ -644,11 +756,12 @@ wxFrame* wxAuiManager::GetFrame() const // need to be managed by the manager itself. wxAuiManager* wxAuiManager::GetManager(wxWindow* window) { - wxAuiManagerEvent evt(wxEVT_AUI_FINDMANAGER); + wxAuiManagerEvent evt(wxEVT_AUI_FIND_MANAGER); + evt.SetManager(NULL); evt.ResumePropagation(wxEVENT_PROPAGATE_MAX); if (!window->ProcessEvent(evt)) return NULL; - + return evt.GetManager(); } @@ -657,7 +770,7 @@ void wxAuiManager::UpdateHintWindowConfig() { // find out if the the system can do transparent frames bool can_do_transparent = false; - + wxWindow* w = m_frame; while (w) { @@ -665,12 +778,13 @@ void wxAuiManager::UpdateHintWindowConfig() { wxFrame* f = static_cast(w); can_do_transparent = f->CanSetTransparent(); + break; } - + w = w->GetParent(); } - + // if there is an existing hint window, delete it if (m_hint_wnd) { @@ -680,9 +794,9 @@ void wxAuiManager::UpdateHintWindowConfig() m_hint_fademax = 50; m_hint_wnd = NULL; - + if ((m_flags & wxAUI_MGR_TRANSPARENT_HINT) && can_do_transparent) - { + { // Make a window to use for a transparent hint #if defined(__WXMSW__) || defined(__WXGTK__) m_hint_wnd = new wxFrame(m_frame, wxID_ANY, wxEmptyString, @@ -700,6 +814,8 @@ void wxAuiManager::UpdateHintWindowConfig() wxDefaultPosition, wxSize(1,1), wxFRAME_FLOAT_ON_PARENT | wxFRAME_TOOL_WINDOW ); + m_hint_wnd->Connect(wxEVT_ACTIVATE, + wxActivateEventHandler(wxAuiManager::OnHintActivate), NULL, this); // Can't set the bg colour of a Frame in wxMac wxPanel* p = new wxPanel(m_hint_wnd); @@ -710,9 +826,9 @@ void wxAuiManager::UpdateHintWindowConfig() // blue. p->SetBackgroundColour(*wxBLUE); #endif - + } - else + else { if ((m_flags & wxAUI_MGR_TRANSPARENT_HINT) != 0 || (m_flags & wxAUI_MGR_VENETIAN_BLINDS_HINT) != 0) @@ -760,6 +876,17 @@ void wxAuiManager::SetManagedWindow(wxWindow* wnd) wxAuiPaneInfo().Name(wxT("mdiclient")). CenterPane().PaneBorder(false)); } + else if (m_frame->IsKindOf(CLASSINFO(wxAuiMDIParentFrame))) + { + wxAuiMDIParentFrame* mdi_frame = (wxAuiMDIParentFrame*)m_frame; + wxAuiMDIClientWindow* client_window = mdi_frame->GetClientWindow(); + wxASSERT_MSG(client_window, wxT("Client window is NULL!")); + + AddPane(client_window, + wxAuiPaneInfo().Name(wxT("mdiclient")). + CenterPane().PaneBorder(false)); + } + #endif UpdateHintWindowConfig(); @@ -817,16 +944,27 @@ void wxAuiManager::SetArtProvider(wxAuiDockArt* art_provider) bool wxAuiManager::AddPane(wxWindow* window, const wxAuiPaneInfo& pane_info) { + wxASSERT_MSG(window, wxT("NULL window ptrs are not allowed")); + // check if the pane has a valid window if (!window) return false; - // check if the pane already exists + // check if the window is already managed by us if (GetPane(pane_info.window).IsOk()) return false; + // check if the pane name already exists, this could reveal a + // bug in the library user's application + bool already_exists = false; + if (!pane_info.name.empty() && GetPane(pane_info.name).IsOk()) + { + wxFAIL_MSG(wxT("A pane with that name already exists in the manager!")); + already_exists = true; + } + // if the new pane is docked then we should undo maximize - if(pane_info.IsDocked()) + if (pane_info.IsDocked()) RestoreMaximizedPane(); m_panes.Add(pane_info); @@ -836,11 +974,12 @@ bool wxAuiManager::AddPane(wxWindow* window, const wxAuiPaneInfo& pane_info) // set the pane window pinfo.window = window; + // if the pane's name identifier is blank, create a random string - if (pinfo.name.empty()) + if (pinfo.name.empty() || already_exists) { pinfo.name.Printf(wxT("%08lx%08x%08x%08lx"), - ((unsigned long)pinfo.window) & 0xffffffff, + wxPtrToUInt(pinfo.window) & 0xffffffff, (unsigned int)time(NULL), #ifdef __WXWINCE__ (unsigned int)GetTickCount(), @@ -860,20 +999,36 @@ bool wxAuiManager::AddPane(wxWindow* window, const wxAuiPaneInfo& pane_info) button.button_id = wxAUI_BUTTON_MAXIMIZE_RESTORE; pinfo.buttons.Add(button); } - + if (pinfo.HasPinButton()) { wxAuiPaneButton button; button.button_id = wxAUI_BUTTON_PIN; pinfo.buttons.Add(button); } - + if (pinfo.HasCloseButton()) { wxAuiPaneButton button; button.button_id = wxAUI_BUTTON_CLOSE; pinfo.buttons.Add(button); } + + if (pinfo.HasGripper()) + { + if (pinfo.window->IsKindOf(CLASSINFO(wxAuiToolBar))) + { + // prevent duplicate gripper -- both wxAuiManager and wxAuiToolBar + // have a gripper control. The toolbar's built-in gripper + // meshes better with the look and feel of the control than ours, + // so turn wxAuiManager's gripper off, and the toolbar's on. + + wxAuiToolBar* tb = static_cast(pinfo.window); + pinfo.SetFlag(wxAuiPaneInfo::optionGripper, false); + tb->SetGripperVisible(true); + } + } + if (pinfo.best_size == wxDefaultSize && pinfo.window) @@ -892,7 +1047,8 @@ bool wxAuiManager::AddPane(wxWindow* window, const wxAuiPaneInfo& pane_info) // I believe this to be the correct action, until // wxToolBar::GetBestSize() is fixed. Is this assumption // correct? - pinfo.best_size.y++; + // commented out by JACS 2007-9-08 after having added a pixel in wxMSW's wxToolBar::DoGetBestSize() + // pinfo.best_size.y++; } if (pinfo.min_size != wxDefaultSize) @@ -904,12 +1060,14 @@ bool wxAuiManager::AddPane(wxWindow* window, const wxAuiPaneInfo& pane_info) } } + + return true; } bool wxAuiManager::AddPane(wxWindow* window, - int direction, - const wxString& caption) + int direction, + const wxString& caption) { wxAuiPaneInfo pinfo; pinfo.Caption(caption); @@ -925,8 +1083,8 @@ bool wxAuiManager::AddPane(wxWindow* window, } bool wxAuiManager::AddPane(wxWindow* window, - const wxAuiPaneInfo& pane_info, - const wxPoint& drop_pos) + const wxAuiPaneInfo& pane_info, + const wxPoint& drop_pos) { if (!AddPane(window, pane_info)) return false; @@ -941,6 +1099,8 @@ bool wxAuiManager::AddPane(wxWindow* window, bool wxAuiManager::InsertPane(wxWindow* window, const wxAuiPaneInfo& pane_info, int insert_level) { + wxASSERT_MSG(window, wxT("NULL window ptrs are not allowed")); + // shift the panes around, depending on the insert level switch (insert_level) { @@ -971,7 +1131,7 @@ bool wxAuiManager::InsertPane(wxWindow* window, const wxAuiPaneInfo& pane_info, { return AddPane(window, pane_info); } - else + else { if (pane_info.IsFloating()) { @@ -981,7 +1141,7 @@ bool wxAuiManager::InsertPane(wxWindow* window, const wxAuiPaneInfo& pane_info, if (pane_info.floating_size != wxDefaultSize) existing_pane.FloatingSize(pane_info.floating_size); } - else + else { // if the new pane is docked then we should undo maximize RestoreMaximizedPane(); @@ -1001,6 +1161,8 @@ bool wxAuiManager::InsertPane(wxWindow* window, const wxAuiPaneInfo& pane_info, // method will not destroy the window that is removed. bool wxAuiManager::DetachPane(wxWindow* window) { + wxASSERT_MSG(window, wxT("NULL window ptrs are not allowed")); + int i, count; for (i = 0, count = m_panes.GetCount(); i < count; ++i) { @@ -1019,11 +1181,11 @@ bool wxAuiManager::DetachPane(wxWindow* window) p.frame->Show(false); // reparent to m_frame and destroy the pane - if(m_action_window == p.frame) + if (m_action_window == p.frame) { m_action_window = NULL; } - + p.window->Reparent(m_frame); p.frame->SetSizer(NULL); p.frame->Destroy(); @@ -1054,8 +1216,7 @@ bool wxAuiManager::DetachPane(wxWindow* window) return false; } -// ClosePane() destroys or hides the pane depending on its -// flags +// ClosePane() destroys or hides the pane depending on its flags void wxAuiManager::ClosePane(wxAuiPaneInfo& pane_info) { // if we were maximized, restore @@ -1084,16 +1245,16 @@ void wxAuiManager::ClosePane(wxAuiPaneInfo& pane_info) } // now we need to either destroy or hide the pane - if (pane_info.IsDestroyOnClose()) + if (pane_info.IsDestroyOnClose()) { wxWindow * window = pane_info.window; DetachPane(window); - if(window) + if (window) { window->Destroy(); } - } - else + } + else { pane_info.Hide(); } @@ -1110,7 +1271,13 @@ void wxAuiManager::MaximizePane(wxAuiPaneInfo& pane_info) if (!p.IsToolbar()) { p.Restore(); - p.SaveHidden(); + + // save hidden state + p.SetFlag(wxAuiPaneInfo::savedHiddenState, + p.HasFlag(wxAuiPaneInfo::optionHidden)); + + // hide the pane, because only the newly + // maximized pane should show p.Hide(); } } @@ -1137,7 +1304,8 @@ void wxAuiManager::RestorePane(wxAuiPaneInfo& pane_info) wxAuiPaneInfo& p = m_panes.Item(i); if (!p.IsToolbar()) { - p.RestoreHidden(); + p.SetFlag(wxAuiPaneInfo::optionHidden, + p.HasFlag(wxAuiPaneInfo::savedHiddenState)); } } @@ -1160,7 +1328,7 @@ void wxAuiManager::RestoreMaximizedPane() for (i = 0, pane_count = m_panes.GetCount(); i < pane_count; ++i) { wxAuiPaneInfo& p = m_panes.Item(i); - if(p.IsMaximized()) + if (p.IsMaximized()) { RestorePane(p); break; @@ -1302,7 +1470,7 @@ wxString wxAuiManager::SavePerspective() { wxString result; result.Alloc(500); - result = wxT("layout1|"); + result = wxT("layout2|"); int pane_i, pane_count = m_panes.GetCount(); for (pane_i = 0; pane_i < pane_count; ++pane_i) @@ -1333,11 +1501,13 @@ bool wxAuiManager::LoadPerspective(const wxString& layout, bool update) wxString part; // check layout string version + // 'layout1' = wxAUI 0.9.0 - wxAUI 0.9.2 + // 'layout2' = wxAUI 0.9.2 (wxWidgets 2.8) part = input.BeforeFirst(wxT('|')); input = input.AfterFirst(wxT('|')); part.Trim(true); part.Trim(false); - if (part != wxT("layout1")) + if (part != wxT("layout2")) return false; // mark all panes currently managed as docked and hidden @@ -1399,12 +1569,11 @@ bool wxAuiManager::LoadPerspective(const wxString& layout, bool update) if (!p.IsOk()) { // the pane window couldn't be found - // in the existing layout - return false; + // in the existing layout -- skip it + continue; } p.SafeSet(pane); - } if (update) @@ -1414,8 +1583,8 @@ bool wxAuiManager::LoadPerspective(const wxString& layout, bool update) } void wxAuiManager::GetPanePositionsAndSizes(wxAuiDockInfo& dock, - wxArrayInt& positions, - wxArrayInt& sizes) + wxArrayInt& positions, + wxArrayInt& sizes) { int caption_size = m_art->GetMetric(wxAUI_DOCKART_CAPTION_SIZE); int pane_border_size = m_art->GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE); @@ -1432,7 +1601,7 @@ void wxAuiManager::GetPanePositionsAndSizes(wxAuiDockInfo& dock, { wxAuiPaneInfo& pane = *(dock.panes.Item(pane_i)); - if (pane.state & wxAuiPaneInfo::actionPane) + if (pane.HasFlag(wxAuiPaneInfo::actionPane)) { wxASSERT_MSG(action_pane==-1, wxT("Too many fixed action panes")); action_pane = pane_i; @@ -1457,7 +1626,7 @@ void wxAuiManager::GetPanePositionsAndSizes(wxAuiDockInfo& dock, size += gripper_size; size += pane.best_size.x; } - else + else { if (pane.HasGripper() && pane.HasGripperTop()) size += gripper_size; @@ -1482,7 +1651,7 @@ void wxAuiManager::GetPanePositionsAndSizes(wxAuiDockInfo& dock, if (amount >= 0) offset += amount; - else + else positions[pane_i] -= -amount; offset += sizes[pane_i]; @@ -1496,7 +1665,7 @@ void wxAuiManager::GetPanePositionsAndSizes(wxAuiDockInfo& dock, int amount = positions[pane_i] - offset; if (amount >= 0) offset += amount; - else + else positions[pane_i] += -amount; offset += sizes[pane_i]; @@ -1505,10 +1674,10 @@ void wxAuiManager::GetPanePositionsAndSizes(wxAuiDockInfo& dock, void wxAuiManager::LayoutAddPane(wxSizer* cont, - wxAuiDockInfo& dock, - wxAuiPaneInfo& pane, - wxAuiDockUIPartArray& uiparts, - bool spacer_only) + wxAuiDockInfo& dock, + wxAuiPaneInfo& pane, + wxAuiDockUIPartArray& uiparts, + bool spacer_only) { wxAuiDockUIPart part; wxSizerItem* sizer_item; @@ -1523,7 +1692,7 @@ void wxAuiManager::LayoutAddPane(wxSizer* cont, int orientation; if (dock.IsHorizontal()) orientation = wxHORIZONTAL; - else + else orientation = wxVERTICAL; // this variable will store the proportion @@ -1587,7 +1756,7 @@ void wxAuiManager::LayoutAddPane(wxSizer* cont, part.sizer_item = sizer_item; uiparts.Add(part); } - + // if we have buttons, add a little space to the right // of them to ease visual crowding if (button_count >= 1) @@ -1626,7 +1795,7 @@ void wxAuiManager::LayoutAddPane(wxSizer* cont, // determine if the pane should have a minimum size; if the pane is - // non-resizable (fixed) then we must set a minimum size. Alternitavely, + // non-resizable (fixed) then we must set a minimum size. Alternatively, // if the pane.min_size is set, we must use that value as well wxSize min_size = pane.min_size; @@ -1675,9 +1844,9 @@ void wxAuiManager::LayoutAddPane(wxSizer* cont, } void wxAuiManager::LayoutAddDock(wxSizer* cont, - wxAuiDockInfo& dock, - wxAuiDockUIPartArray& uiparts, - bool spacer_only) + wxAuiDockInfo& dock, + wxAuiDockUIPartArray& uiparts, + bool spacer_only) { wxSizerItem* sizer_item; wxAuiDockUIPart part; @@ -1721,16 +1890,17 @@ void wxAuiManager::LayoutAddDock(wxSizer* cont, { wxAuiPaneInfo& pane = *(dock.panes.Item(pane_i)); int pane_pos = pane_positions.Item(pane_i); - if(pane.IsMaximized()) { + + if (pane.IsMaximized()) has_maximized_pane = true; - } + int amount = pane_pos - offset; if (amount > 0) { if (dock.IsVertical()) sizer_item = dock_sizer->Add(1, amount, 0, wxEXPAND); - else + else sizer_item = dock_sizer->Add(amount, 1, 0, wxEXPAND); part.type = wxAuiDockUIPart::typeBackground; @@ -1751,7 +1921,7 @@ void wxAuiManager::LayoutAddDock(wxSizer* cont, } // at the end add a very small stretchable background area - sizer_item = dock_sizer->Add(1,1, 1, wxEXPAND); + sizer_item = dock_sizer->Add(0,0, 1, wxEXPAND); part.type = wxAuiDockUIPart::typeBackground; part.dock = &dock; @@ -1767,9 +1937,9 @@ void wxAuiManager::LayoutAddDock(wxSizer* cont, for (pane_i = 0; pane_i < pane_count; ++pane_i) { wxAuiPaneInfo& pane = *(dock.panes.Item(pane_i)); - if(pane.IsMaximized()) { + + if (pane.IsMaximized()) has_maximized_pane = true; - } // if this is not the first pane being added, // we need to add a pane sizer @@ -1793,7 +1963,7 @@ void wxAuiManager::LayoutAddDock(wxSizer* cont, if (dock.dock_direction == wxAUI_DOCK_CENTER || has_maximized_pane) sizer_item = cont->Add(dock_sizer, 1, wxEXPAND); - else + else sizer_item = cont->Add(dock_sizer, 0, wxEXPAND); part.type = wxAuiDockUIPart::typeDock; @@ -1807,12 +1977,14 @@ void wxAuiManager::LayoutAddDock(wxSizer* cont, if (dock.IsHorizontal()) cont->SetItemMinSize(dock_sizer, 0, dock.size); - else + else cont->SetItemMinSize(dock_sizer, dock.size, 0); // top and left docks have a sash after them - if (!m_has_maximized && !dock.fixed && (dock.dock_direction == wxAUI_DOCK_TOP || - dock.dock_direction == wxAUI_DOCK_LEFT)) + if (!m_has_maximized && + !dock.fixed && + (dock.dock_direction == wxAUI_DOCK_TOP || + dock.dock_direction == wxAUI_DOCK_LEFT)) { sizer_item = cont->Add(sash_size, sash_size, 0, wxEXPAND); @@ -1828,9 +2000,9 @@ void wxAuiManager::LayoutAddDock(wxSizer* cont, } wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes, - wxAuiDockInfoArray& docks, - wxAuiDockUIPartArray& uiparts, - bool spacer_only) + wxAuiDockInfoArray& docks, + wxAuiDockUIPartArray& uiparts, + bool spacer_only) { wxBoxSizer* container = new wxBoxSizer(wxVERTICAL); @@ -1842,7 +2014,19 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes, // empty all docks out for (i = 0, dock_count = docks.GetCount(); i < dock_count; ++i) - docks.Item(i).panes.Empty(); + { + wxAuiDockInfo& dock = docks.Item(i); + + // empty out all panes, as they will be readded below + dock.panes.Empty(); + + if (dock.fixed) + { + // always reset fixed docks' sizes, because + // the contained windows may have been resized + dock.size = 0; + } + } // iterate through all known panes, filing each @@ -1852,16 +2036,18 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes, { wxAuiPaneInfo& p = panes.Item(i); - // find any docks in this layer + // find any docks with the same dock direction, dock layer, and + // dock row as the pane we are working on wxAuiDockInfo* dock; wxAuiDockInfoPtrArray arr; FindDocks(docks, p.dock_direction, p.dock_layer, p.dock_row, arr); if (arr.GetCount() > 0) { + // found the right dock dock = arr.Item(0); } - else + else { // dock was not found, so we need to create a new one wxAuiDockInfo d; @@ -1883,7 +2069,7 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes, if (!FindPaneInDock(*dock, p.window)) dock->panes.Add(&p); } - else + else { // remove the pane from any existing docks RemovePaneFromDocks(docks, p); @@ -1924,7 +2110,7 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes, if (dock.IsHorizontal()) size = wxMax(pane_size.y, size); - else + else size = wxMax(pane_size.x, size); } @@ -1953,17 +2139,22 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes, } } - if (!(m_flags & wxAUI_MGR_NO_DOCK_SIZE_LIMIT)) - { - // new dock's size may not be more than 1/3 of the frame size - if (dock.IsHorizontal()) - size = wxMin(size, cli_size.y/3); - else - size = wxMin(size, cli_size.x/3); - } - + + // new dock's size may not be more than the dock constraint + // parameter specifies. See SetDockSizeConstraint() + + int max_dock_x_size = (int)(m_dock_constraint_x * ((double)cli_size.x)); + int max_dock_y_size = (int)(m_dock_constraint_y * ((double)cli_size.y)); + + if (dock.IsHorizontal()) + size = wxMin(size, max_dock_y_size); + else + size = wxMin(size, max_dock_x_size); + + // absolute minimum size for a dock is 10 pixels if (size < 10) size = 10; + dock.size = size; } @@ -1986,7 +2177,7 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes, if (pane.min_size.y > dock_min_size) dock_min_size = pane.min_size.y; } - else + else { if (pane.min_size.x > dock_min_size) dock_min_size = pane.min_size.x; @@ -2020,7 +2211,9 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes, dock.fixed = false; if (!pane.IsToolbar()) dock.toolbar = false; - if (pane.state & wxAuiPaneInfo::actionPane) + if (pane.HasFlag(wxAuiPaneInfo::optionDockFixed)) + dock.fixed = true; + if (pane.HasFlag(wxAuiPaneInfo::actionPane)) action_pane_marked = true; } @@ -2040,7 +2233,7 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes, // if the dock mode is fixed, and none of the panes // are being moved right now, make sure the panes // do not overlap each other. If they do, we will - // adjust the panes' positions + // adjust the positions of the panes if (dock.fixed && !action_pane_marked) { wxArrayInt pane_positions, pane_sizes; @@ -2055,7 +2248,7 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes, int amount = pane.dock_pos - offset; if (amount >= 0) offset += amount; - else + else pane.dock_pos += -amount; offset += pane_sizes[j]; @@ -2099,7 +2292,6 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes, // find any top docks in this layer FindDocks(docks, wxAUI_DOCK_TOP, layer, -1, arr); - RenumberDockRows(arr); if (!arr.IsEmpty()) { for (row = 0, row_count = arr.GetCount(); row < row_count; ++row) @@ -2114,7 +2306,6 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes, // find any left docks in this layer FindDocks(docks, wxAUI_DOCK_LEFT, layer, -1, arr); - RenumberDockRows(arr); if (!arr.IsEmpty()) { for (row = 0, row_count = arr.GetCount(); row < row_count; ++row) @@ -2132,7 +2323,7 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes, for (row = 0,row_count = arr.GetCount(); rowAdd(1,1, 1, wxEXPAND); @@ -2146,27 +2337,28 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes, uiparts.Add(part); } } - else + else { middle->Add(old_cont, 1, wxEXPAND); } // find any right docks in this layer FindDocks(docks, wxAUI_DOCK_RIGHT, layer, -1, arr); - RenumberDockRows(arr); if (!arr.IsEmpty()) { for (row = arr.GetCount()-1; row >= 0; --row) LayoutAddDock(middle, *arr.Item(row), uiparts, spacer_only); } - cont->Add(middle, 1, wxEXPAND); - + if (middle->GetChildren().GetCount() > 0) + cont->Add(middle, 1, wxEXPAND); + else + delete middle; + // find any bottom docks in this layer FindDocks(docks, wxAUI_DOCK_BOTTOM, layer, -1, arr); - RenumberDockRows(arr); if (!arr.IsEmpty()) { for (row = arr.GetCount()-1; row >= 0; --row) @@ -2196,12 +2388,36 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes, } +// SetDockSizeConstraint() allows the dock constraints to be set. For example, +// specifying values of 0.5, 0.5 will mean that upon dock creation, a dock may +// not be larger than half of the window's size + +void wxAuiManager::SetDockSizeConstraint(double width_pct, double height_pct) +{ + m_dock_constraint_x = wxMax(0.0, wxMin(1.0, width_pct)); + m_dock_constraint_y = wxMax(0.0, wxMin(1.0, height_pct)); +} + +void wxAuiManager::GetDockSizeConstraint(double* width_pct, double* height_pct) const +{ + if (width_pct) + *width_pct = m_dock_constraint_x; + + if (height_pct) + *height_pct = m_dock_constraint_y; +} + + + // Update() updates the layout. Whenever changes are made to // one or more panes, this function should be called. It is the // external entry point for running the layout engine. void wxAuiManager::Update() { + m_hover_button = NULL; + m_action_part = NULL; + wxSizer* sizer; int i, pane_count = m_panes.GetCount(); @@ -2221,30 +2437,30 @@ void wxAuiManager::Update() p.window->SetSize(1,1); - // the following block is a workaround for bug #1531361 - // (see wxWidgets sourceforge page). On wxGTK (only), when - // a frame is shown/hidden, a move event unfortunately - // also gets fired. Because we may be dragging around - // a pane, we need to cancel that action here to prevent - // a spurious crash. - if (m_action_window == p.frame) - { - if (wxWindow::GetCapture() == m_frame) + // the following block is a workaround for bug #1531361 + // (see wxWidgets sourceforge page). On wxGTK (only), when + // a frame is shown/hidden, a move event unfortunately + // also gets fired. Because we may be dragging around + // a pane, we need to cancel that action here to prevent + // a spurious crash. + if (m_action_window == p.frame) + { + if (wxWindow::GetCapture() == m_frame) m_frame->ReleaseMouse(); m_action = actionNone; - m_action_window = NULL; - } + m_action_window = NULL; + } - // hide the frame + // hide the frame if (p.frame->IsShown()) p.frame->Show(false); // reparent to m_frame and destroy the pane - if(m_action_window == p.frame) + if (m_action_window == p.frame) { m_action_window = NULL; } - + p.window->Reparent(m_frame); p.frame->SetSizer(NULL); p.frame->Destroy(); @@ -2286,23 +2502,28 @@ void wxAuiManager::Update() if (p.IsShown() && !frame->IsShown()) frame->Show(); } - else + else { // frame already exists, make sure it's position // and size reflect the information in wxAuiPaneInfo - if (p.frame->GetPosition() != p.floating_pos) + if ((p.frame->GetPosition() != p.floating_pos) || (p.frame->GetSize() != p.floating_size)) { + p.frame->SetSize(p.floating_pos.x, p.floating_pos.y, + p.floating_size.x, p.floating_size.y, + wxSIZE_USE_EXISTING); + /* p.frame->SetSize(p.floating_pos.x, p.floating_pos.y, wxDefaultCoord, wxDefaultCoord, wxSIZE_USE_EXISTING); //p.frame->Move(p.floating_pos.x, p.floating_pos.y); + */ } if (p.frame->IsShown() != p.IsShown()) p.frame->Show(p.IsShown()); } } - else + else { if (p.window->IsShown() != p.IsShown()) p.window->Show(p.IsShown()); @@ -2505,7 +2726,7 @@ int wxAuiManager::GetDockPixelOffset(wxAuiPaneInfo& test) { if (dock.IsVertical()) return dock.rect.y; - else + else return dock.rect.x; } } @@ -2520,7 +2741,7 @@ int wxAuiManager::GetDockPixelOffset(wxAuiPaneInfo& test) // the target info. If the operation was allowed, the function returns true. bool wxAuiManager::ProcessDockResult(wxAuiPaneInfo& target, - const wxAuiPaneInfo& new_pos) + const wxAuiPaneInfo& new_pos) { bool allowed = false; switch (new_pos.dock_direction) @@ -2552,10 +2773,10 @@ const int auiLayerInsertPixels = 40; const int auiLayerInsertOffset = 5; bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks, - wxAuiPaneInfoArray& panes, - wxAuiPaneInfo& target, - const wxPoint& pt, - const wxPoint& offset) + wxAuiPaneInfoArray& panes, + wxAuiPaneInfo& target, + const wxPoint& pt, + const wxPoint& offset) { wxSize cli_size = m_frame->GetClientSize(); @@ -2571,15 +2792,20 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks, int layer_insert_offset = auiLayerInsertOffset; - if (target.IsToolbar()) + if (drop.IsToolbar()) layer_insert_offset = 0; + if (pt.x < layer_insert_offset && pt.x > layer_insert_offset-auiLayerInsertPixels) { int new_layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_LEFT), GetMaxLayer(docks, wxAUI_DOCK_BOTTOM)), - GetMaxLayer(docks, wxAUI_DOCK_TOP)) + 1; + GetMaxLayer(docks, wxAUI_DOCK_TOP)) + 1; + + if (drop.IsToolbar()) + new_layer = auiToolBarLayer; + drop.Dock().Left(). Layer(new_layer). Row(0). @@ -2592,6 +2818,10 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks, int new_layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_TOP), GetMaxLayer(docks, wxAUI_DOCK_LEFT)), GetMaxLayer(docks, wxAUI_DOCK_RIGHT)) + 1; + + if (drop.IsToolbar()) + new_layer = auiToolBarLayer; + drop.Dock().Top(). Layer(new_layer). Row(0). @@ -2603,8 +2833,11 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks, { int new_layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_RIGHT), GetMaxLayer(docks, wxAUI_DOCK_TOP)), - GetMaxLayer(docks, wxAUI_DOCK_BOTTOM)) + 1; - + GetMaxLayer(docks, wxAUI_DOCK_BOTTOM)) + 1; + + if (drop.IsToolbar()) + new_layer = auiToolBarLayer; + drop.Dock().Right(). Layer(new_layer). Row(0). @@ -2618,6 +2851,9 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks, GetMaxLayer(docks, wxAUI_DOCK_LEFT)), GetMaxLayer(docks, wxAUI_DOCK_RIGHT)) + 1; + if (drop.IsToolbar()) + new_layer = auiToolBarLayer; + drop.Dock().Bottom(). Layer(new_layer). Row(0). @@ -2625,6 +2861,7 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks, return ProcessDockResult(target, drop); } + wxAuiDockUIPart* part = HitTest(pt.x, pt.y); @@ -2638,7 +2875,7 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks, int dock_drop_offset = 0; if (part->dock->IsHorizontal()) dock_drop_offset = pt.x - part->dock->rect.x - offset.x; - else + else dock_drop_offset = pt.y - part->dock->rect.y - offset.y; @@ -2658,7 +2895,8 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks, (part->dock->dock_direction != wxAUI_DOCK_CENTER && part->dock->dock_direction != wxAUI_DOCK_NONE))) { - drop.Float(); + if (drop.IsFloatable()) + drop.Float(); } m_skipping = false; @@ -2670,16 +2908,11 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks, return ProcessDockResult(target, drop); } - else - { - m_skipping = false; - } - if (!m_skipping) - { - m_last_rect = part->dock->rect; - m_last_rect.Inflate( 15, 15 ); - } + m_skipping = false; + + m_last_rect = part->dock->rect; + m_last_rect.Inflate( 15, 15 ); drop.Dock(). Direction(part->dock->dock_direction). @@ -2857,23 +3090,19 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks, insert_layer = 0; insert_dock_row = true; - if (pt.x >= part->rect.x && - pt.x < part->rect.x+new_row_pixels_x) - insert_dir = wxAUI_DOCK_LEFT; - else - if (pt.y >= part->rect.y && - pt.y < part->rect.y+new_row_pixels_y) - insert_dir = wxAUI_DOCK_TOP; - else - if (pt.x >= part->rect.x + part->rect.width-new_row_pixels_x && - pt.x < part->rect.x + part->rect.width) - insert_dir = wxAUI_DOCK_RIGHT; - else - if (pt.y >= part->rect.y+ part->rect.height-new_row_pixels_y && - pt.y < part->rect.y + part->rect.height) - insert_dir = wxAUI_DOCK_BOTTOM; - else - return false; + const wxRect& pr = part->rect; + if (pt.x >= pr.x && pt.x < pr.x + new_row_pixels_x) + insert_dir = wxAUI_DOCK_LEFT; + else if (pt.y >= pr.y && pt.y < pr.y + new_row_pixels_y) + insert_dir = wxAUI_DOCK_TOP; + else if (pt.x >= pr.x + pr.width - new_row_pixels_x && + pt.x < pr.x + pr.width) + insert_dir = wxAUI_DOCK_RIGHT; + else if (pt.y >= pr.y+ pr.height - new_row_pixels_y && + pt.y < pr.y + pr.height) + insert_dir = wxAUI_DOCK_BOTTOM; + else + return false; insert_row = GetMaxRow(panes, insert_dir, insert_layer) + 1; } @@ -2899,7 +3128,7 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks, offset = pt.y - part->rect.y; size = part->rect.GetHeight(); } - else + else { offset = pt.x - part->rect.x; size = part->rect.GetWidth(); @@ -2965,7 +3194,7 @@ void wxAuiManager::ShowHint(const wxRect& rect) m_last_hint = rect; m_hint_fadeamt = m_hint_fademax; - + if ((m_flags & wxAUI_MGR_HINT_FADE) && !((m_hint_wnd->IsKindOf(CLASSINFO(wxPseudoTransparentFrame))) && (m_flags & wxAUI_MGR_NO_VENETIAN_BLINDS_FADE)) @@ -2973,6 +3202,7 @@ void wxAuiManager::ShowHint(const wxRect& rect) m_hint_fadeamt = 0; m_hint_wnd->SetSize(rect); + m_hint_wnd->SetTransparent(m_hint_fadeamt); if (!m_hint_wnd->IsShown()) m_hint_wnd->Show(); @@ -2982,7 +3212,6 @@ void wxAuiManager::ShowHint(const wxRect& rect) if (m_action == actionDragFloatingPane && m_action_window) m_action_window->SetFocus(); - m_hint_wnd->SetTransparent(m_hint_fadeamt); m_hint_wnd->Raise(); @@ -2993,11 +3222,11 @@ void wxAuiManager::ShowHint(const wxRect& rect) m_hint_fadetimer.Start(5); } } - else // Not using a transparent hint window... + else // Not using a transparent hint window... { if (!(m_flags & wxAUI_MGR_RECTANGLE_HINT)) return; - + if (m_last_hint != rect) { // remove the last hint rectangle @@ -3035,7 +3264,7 @@ void wxAuiManager::ShowHint(const wxRect& rect) // nasty redrawn problems. clip.Intersect(m_frame->GetRect()); - screendc.SetClippingRegion(clip); + screendc.SetDeviceClippingRegion(clip); wxBitmap stipple = wxPaneCreateStippleBitmap(); wxBrush brush(stipple); @@ -3071,7 +3300,39 @@ void wxAuiManager::HideHint() } } +void wxAuiManager::OnHintActivate(wxActivateEvent& WXUNUSED(event)) +{ + // Do nothing so this event isn't handled in the base handlers. + // Letting the hint window activate without this handler can lead to + // weird behavior on Mac where the menu is switched out to the top + // window's menu in MDI applications when it shouldn't be. So since + // we don't want user interaction with the hint window anyway, we just + // prevent it from activating here. +} + + + +void wxAuiManager::StartPaneDrag(wxWindow* pane_window, + const wxPoint& offset) +{ + wxAuiPaneInfo& pane = GetPane(pane_window); + if (!pane.IsOk()) + return; + + if (pane.IsToolbar()) + { + m_action = actionDragToolbarPane; + } + else + { + m_action = actionDragFloatingPane; + } + + m_action_window = pane_window; + m_action_offset = offset; + m_frame->CaptureMouse(); +} // CalculateHintRect() calculates the drop hint rectangle. The method @@ -3100,6 +3361,7 @@ wxRect wxAuiManager::CalculateHintRect(wxWindow* pane_window, wxAuiDockUIPartArray uiparts; wxAuiPaneInfo hint = GetPane(pane_window); hint.name = wxT("__HINT__"); + hint.PaneBorder(true); hint.Show(); if (!hint.IsOk()) @@ -3156,6 +3418,12 @@ wxRect wxAuiManager::CalculateHintRect(wxWindow* pane_window, // actually show the hint rectangle on the screen m_frame->ClientToScreen(&rect.x, &rect.y); + if ( m_frame->GetLayoutDirection() == wxLayout_RightToLeft ) + { + // Mirror rectangle in RTL mode + rect.x -= rect.GetWidth(); + } + return rect; } @@ -3168,12 +3436,12 @@ void wxAuiManager::DrawHintRect(wxWindow* pane_window, const wxPoint& offset) { wxRect rect = CalculateHintRect(pane_window, pt, offset); - + if (rect.IsEmpty()) { HideHint(); } - else + else { ShowHint(rect); } @@ -3207,22 +3475,22 @@ void wxAuiManager::OnFloatingPaneMoving(wxWindow* wnd, wxDirection dir) pt.y = pos.y; // and some more pixels for the title bar pt.y -= 5; - } else - if (dir == wxWEST) + } + else if (dir == wxWEST) { // move to pane's left border wxPoint pos( 0,0 ); pos = wnd->ClientToScreen( pos ); pt.x = pos.x; - } else - if (dir == wxEAST) + } + else if (dir == wxEAST) { // move to pane's right border wxPoint pos( wnd->GetSize().x, 0 ); pos = wnd->ClientToScreen( pos ); pt.x = pos.x; - } else - if (dir == wxSOUTH) + } + else if (dir == wxSOUTH) { // move to pane's bottom border wxPoint pos( 0, wnd->GetSize().y ); @@ -3243,27 +3511,24 @@ void wxAuiManager::OnFloatingPaneMoving(wxWindow* wnd, wxDirection dir) // no hint for toolbar floating windows if (pane.IsToolbar() && m_action == actionDragFloatingPane) { - if (m_action == actionDragFloatingPane) - { - wxAuiDockInfoArray docks; - wxAuiPaneInfoArray panes; - wxAuiDockUIPartArray uiparts; - wxAuiPaneInfo hint = pane; + wxAuiDockInfoArray docks; + wxAuiPaneInfoArray panes; + wxAuiDockUIPartArray uiparts; + wxAuiPaneInfo hint = pane; - CopyDocksAndPanes(docks, panes, m_docks, m_panes); + CopyDocksAndPanes(docks, panes, m_docks, m_panes); - // find out where the new pane would be - if (!DoDrop(docks, panes, hint, client_pt)) - return; - if (hint.IsFloating()) - return; + // find out where the new pane would be + if (!DoDrop(docks, panes, hint, client_pt)) + return; + if (hint.IsFloating()) + return; - pane = hint; - m_action = actionDragToolbarPane; - m_action_window = pane.window; + pane = hint; + m_action = actionDragToolbarPane; + m_action_window = pane.window; - Update(); - } + Update(); return; } @@ -3271,7 +3536,7 @@ void wxAuiManager::OnFloatingPaneMoving(wxWindow* wnd, wxDirection dir) // if a key modifier is pressed while dragging the frame, // don't dock the window - if (wxGetKeyState(WXK_CONTROL) || wxGetKeyState(WXK_ALT)) + if (!CanDockPanel(pane)) { HideHint(); return; @@ -3310,22 +3575,22 @@ void wxAuiManager::OnFloatingPaneMoved(wxWindow* wnd, wxDirection dir) pt.y = pos.y; // and some more pixels for the title bar pt.y -= 10; - } else - if (dir == wxWEST) + } + else if (dir == wxWEST) { // move to pane's left border wxPoint pos( 0,0 ); pos = wnd->ClientToScreen( pos ); pt.x = pos.x; - } else - if (dir == wxEAST) + } + else if (dir == wxEAST) { // move to pane's right border wxPoint pos( wnd->GetSize().x, 0 ); pos = wnd->ClientToScreen( pos ); pt.x = pos.x; - } else - if (dir == wxSOUTH) + } + else if (dir == wxSOUTH) { // move to pane's bottom border wxPoint pos( 0, wnd->GetSize().y ); @@ -3343,10 +3608,9 @@ void wxAuiManager::OnFloatingPaneMoved(wxWindow* wnd, wxDirection dir) wxPoint frame_pos = pane.frame->GetPosition(); wxPoint action_offset(pt.x-frame_pos.x, pt.y-frame_pos.y); - // if a key modifier is pressed while dragging the frame, // don't dock the window - if (!wxGetKeyState(WXK_CONTROL) && !wxGetKeyState(WXK_ALT)) + if (CanDockPanel(pane)) { // do the drop calculation DoDrop(m_docks, m_panes, pane, client_pt, action_offset); @@ -3361,7 +3625,7 @@ void wxAuiManager::OnFloatingPaneMoved(wxWindow* wnd, wxDirection dir) if (m_flags & wxAUI_MGR_TRANSPARENT_DRAG) pane.frame->SetTransparent(255); } - else if (m_has_maximized) + else if (m_has_maximized) { RestoreMaximizedPane(); } @@ -3389,7 +3653,7 @@ void wxAuiManager::OnFloatingPaneClosed(wxWindow* wnd, wxCloseEvent& evt) // fire pane close event - wxAuiManagerEvent e(wxEVT_AUI_PANECLOSE); + wxAuiManagerEvent e(wxEVT_AUI_PANE_CLOSE); e.SetPane(&pane); e.SetCanVeto(evt.CanVeto()); ProcessMgrEvent(e); @@ -3399,9 +3663,17 @@ void wxAuiManager::OnFloatingPaneClosed(wxWindow* wnd, wxCloseEvent& evt) evt.Veto(); return; } - else + else { - ClosePane(pane); + // close the pane, but check that it + // still exists in our pane array first + // (the event handler above might have removed it) + + wxAuiPaneInfo& check = GetPane(wnd); + if (check.IsOk()) + { + ClosePane(pane); + } } } @@ -3409,11 +3681,8 @@ void wxAuiManager::OnFloatingPaneClosed(wxWindow* wnd, wxCloseEvent& evt) void wxAuiManager::OnFloatingPaneActivated(wxWindow* wnd) { - if (GetFlags() & wxAUI_MGR_ALLOW_ACTIVE_PANE) + if ((GetFlags() & wxAUI_MGR_ALLOW_ACTIVE_PANE) && GetPane(wnd).IsOk()) { - // try to find the pane - wxASSERT_MSG(GetPane(wnd).IsOk(), wxT("Pane window not found")); - SetActivePane(m_panes, wnd); Repaint(); } @@ -3425,6 +3694,10 @@ void wxAuiManager::OnFloatingPaneActivated(wxWindow* wnd) void wxAuiManager::OnRender(wxAuiManagerEvent& evt) { + // if the frame is about to be deleted, don't bother + if (!m_frame || wxPendingDelete.Member(m_frame)) + return; + wxDC* dc = evt.GetDC(); #ifdef __WXMAC__ @@ -3436,8 +3709,8 @@ void wxAuiManager::OnRender(wxAuiManagerEvent& evt) { wxAuiDockUIPart& part = m_uiparts.Item(i); - // don't draw hidden pane items - if (part.sizer_item && !part.sizer_item->IsShown()) + // don't draw hidden pane items or items that aren't windows + if (part.sizer_item && ((!part.sizer_item->IsWindow() && !part.sizer_item->IsSpacer() && !part.sizer_item->IsSizer()) || !part.sizer_item->IsShown())) continue; switch (part.type) @@ -3476,6 +3749,7 @@ void wxAuiManager::OnRender(wxAuiManagerEvent& evt) void wxAuiManager::Render(wxDC* dc) { wxAuiManagerEvent e(wxEVT_AUI_RENDER); + e.SetManager(this); e.SetDC(dc); ProcessMgrEvent(e); } @@ -3538,7 +3812,7 @@ void wxAuiManager::OnSize(wxSizeEvent& event) { DoFrameLayout(); Repaint(); - + #if wxUSE_MDI if (m_frame->IsKindOf(CLASSINFO(wxMDIParentFrame))) { @@ -3562,7 +3836,7 @@ void wxAuiManager::OnFindManager(wxAuiManagerEvent& evt) evt.SetManager(NULL); return; } - + // if we are managing a child frame, get the 'real' manager if (window->IsKindOf(CLASSINFO(wxAuiFloatingFrame))) { @@ -3570,7 +3844,7 @@ void wxAuiManager::OnFindManager(wxAuiManagerEvent& evt) evt.SetManager(float_frame->GetOwnerManager()); return; } - + // return pointer to ourself evt.SetManager(this); } @@ -3599,10 +3873,10 @@ void wxAuiManager::OnSetCursor(wxSetCursorEvent& event) if (part->orientation == wxVERTICAL) cursor = wxCursor(wxCURSOR_SIZEWE); - else + else cursor = wxCursor(wxCURSOR_SIZENS); } - else if (part->type == wxAuiDockUIPart::typeGripper) + else if (part->type == wxAuiDockUIPart::typeGripper) { cursor = wxCursor(wxCURSOR_SIZING); } @@ -3619,17 +3893,17 @@ void wxAuiManager::UpdateButtonOnScreen(wxAuiDockUIPart* button_ui_part, wxAuiDockUIPart* hit_test = HitTest(event.GetX(), event.GetY()); if (!hit_test || !button_ui_part) return; - + int state = wxAUI_BUTTON_STATE_NORMAL; if (hit_test == button_ui_part) { if (event.LeftDown()) state = wxAUI_BUTTON_STATE_PRESSED; - else + else state = wxAUI_BUTTON_STATE_HOVER; } - else + else { if (event.LeftDown()) state = wxAUI_BUTTON_STATE_HOVER; @@ -3662,9 +3936,10 @@ void wxAuiManager::OnLeftDown(wxMouseEvent& event) if (part->type == wxAuiDockUIPart::typeDockSizer || part->type == wxAuiDockUIPart::typePaneSizer) { - if (part->dock && part->dock->dock_direction == wxAUI_DOCK_CENTER) - return; - + // Removing this restriction so that a centre pane can be resized + //if (part->dock && part->dock->dock_direction == wxAUI_DOCK_CENTER) + // return; + // a dock may not be resized if it has a single // pane which is not resizable if (part->type == wxAuiDockUIPart::typeDockSizer && part->dock && @@ -3684,7 +3959,7 @@ void wxAuiManager::OnLeftDown(wxMouseEvent& event) event.m_y - part->rect.y); m_frame->CaptureMouse(); } - else if (part->type == wxAuiDockUIPart::typePaneButton) + else if (part->type == wxAuiDockUIPart::typePaneButton) { m_action = actionClickButton; m_action_part = part; @@ -3693,11 +3968,28 @@ void wxAuiManager::OnLeftDown(wxMouseEvent& event) UpdateButtonOnScreen(part, event); } - else if (part->type == wxAuiDockUIPart::typeCaption || + else if (part->type == wxAuiDockUIPart::typeCaption || part->type == wxAuiDockUIPart::typeGripper) { - if (part->dock && part->dock->dock_direction == wxAUI_DOCK_CENTER) + // if we are managing a wxAuiFloatingFrame window, then + // we are an embedded wxAuiManager inside the wxAuiFloatingFrame. + // We want to initiate a toolbar drag in our owner manager + wxWindow* managed_wnd = GetManagedWindow(); + + if (part->pane && + part->pane->window && + managed_wnd && + managed_wnd->IsKindOf(CLASSINFO(wxAuiFloatingFrame))) + { + wxAuiFloatingFrame* floating_frame = (wxAuiFloatingFrame*)managed_wnd; + wxAuiManager* owner_mgr = floating_frame->GetOwnerManager(); + owner_mgr->StartPaneDrag(part->pane->window, + wxPoint(event.m_x - part->rect.x, + event.m_y - part->rect.y)); return; + } + + if (GetFlags() & wxAUI_MGR_ALLOW_ACTIVE_PANE) { @@ -3706,6 +3998,9 @@ void wxAuiManager::OnLeftDown(wxMouseEvent& event) Repaint(); } + if (part->dock && part->dock->dock_direction == wxAUI_DOCK_CENTER) + return; + m_action = actionClickCaption; m_action_part = part; m_action_start = wxPoint(event.m_x, event.m_y); @@ -3770,8 +4065,8 @@ void wxAuiManager::OnLeftUp(wxMouseEvent& event) Update(); Repaint(NULL); } - else if (m_action_part && - m_action_part->type == wxAuiDockUIPart::typePaneSizer) + else if (m_action_part && + m_action_part->type == wxAuiDockUIPart::typePaneSizer) { wxAuiDockInfo& dock = *m_action_part->dock; wxAuiPaneInfo& pane = *m_action_part->pane; @@ -3796,13 +4091,13 @@ void wxAuiManager::OnLeftUp(wxMouseEvent& event) // this will help us recalculate the pane's proportion if (dock.IsHorizontal()) new_pixsize = new_pos.x - pane_part->rect.x; - else + else new_pixsize = new_pos.y - pane_part->rect.y; // determine the size of the dock, based on orientation if (dock.IsHorizontal()) dock_pixels = dock.rect.GetWidth(); - else + else dock_pixels = dock.rect.GetHeight(); // determine the total proportion of all resizable panes, @@ -3829,10 +4124,10 @@ void wxAuiManager::OnLeftUp(wxMouseEvent& event) { if (dock.IsHorizontal()) dock_pixels -= p.best_size.x; - else + else dock_pixels -= p.best_size.y; } - else + else { total_proportion += p.dock_proportion; } @@ -3889,7 +4184,7 @@ void wxAuiManager::OnLeftUp(wxMouseEvent& event) if (pane.HasCaption()) min_size += caption_size; } - else + else { min_size += pane.min_size.x; } @@ -3925,16 +4220,21 @@ void wxAuiManager::OnLeftUp(wxMouseEvent& event) { m_hover_button = NULL; m_frame->ReleaseMouse(); - UpdateButtonOnScreen(m_action_part, event); - - // make sure we're still over the item that was originally clicked - if (m_action_part == HitTest(event.GetX(), event.GetY())) + + if (m_action_part) { - // fire button-click event - wxAuiManagerEvent e(wxEVT_AUI_PANEBUTTON); - e.SetPane(m_action_part->pane); - e.SetButton(m_action_part->button->button_id); - ProcessMgrEvent(e); + UpdateButtonOnScreen(m_action_part, event); + + // make sure we're still over the item that was originally clicked + if (m_action_part == HitTest(event.GetX(), event.GetY())) + { + // fire button-click event + wxAuiManagerEvent e(wxEVT_AUI_PANE_BUTTON); + e.SetManager(this); + e.SetPane(m_action_part->pane); + e.SetButton(m_action_part->button->button_id); + ProcessMgrEvent(e); + } } } else if (m_action == actionClickCaption) @@ -3997,20 +4297,23 @@ void wxAuiManager::OnMotion(wxMouseEvent& event) if (m_action == actionResize) { - wxPoint pos = m_action_part->rect.GetPosition(); - if (m_action_part->orientation == wxHORIZONTAL) - pos.y = wxMax(0, event.m_y - m_action_offset.y); - else - pos.x = wxMax(0, event.m_x - m_action_offset.x); + if (m_action_part) + { + wxPoint pos = m_action_part->rect.GetPosition(); + if (m_action_part->orientation == wxHORIZONTAL) + pos.y = wxMax(0, event.m_y - m_action_offset.y); + else + pos.x = wxMax(0, event.m_x - m_action_offset.x); - wxRect rect(m_frame->ClientToScreen(pos), - m_action_part->rect.GetSize()); + wxRect rect(m_frame->ClientToScreen(pos), + m_action_part->rect.GetSize()); - wxScreenDC dc; - if (!m_action_hintrect.IsEmpty()) - DrawResizeHint(dc, m_action_hintrect); - DrawResizeHint(dc, rect); - m_action_hintrect = rect; + wxScreenDC dc; + if (!m_action_hintrect.IsEmpty()) + DrawResizeHint(dc, m_action_hintrect); + DrawResizeHint(dc, rect); + m_action_hintrect = rect; + } } else if (m_action == actionClickCaption) { @@ -4020,8 +4323,9 @@ void wxAuiManager::OnMotion(wxMouseEvent& event) // caption has been clicked. we need to check if the mouse // is now being dragged. if it is, we need to change the // mouse action to 'drag' - if (abs(event.m_x - m_action_start.x) > drag_x_threshold || - abs(event.m_y - m_action_start.y) > drag_y_threshold) + if (m_action_part && + (abs(event.m_x - m_action_start.x) > drag_x_threshold || + abs(event.m_y - m_action_start.y) > drag_y_threshold)) { wxAuiPaneInfo* pane_info = m_action_part->pane; @@ -4038,9 +4342,8 @@ void wxAuiManager::OnMotion(wxMouseEvent& event) pt.y - m_action_offset.y); // float the window - if(pane_info->IsMaximized()) { + if (pane_info->IsMaximized()) RestorePane(*pane_info); - } pane_info->Float(); Update(); @@ -4056,7 +4359,7 @@ void wxAuiManager::OnMotion(wxMouseEvent& event) m_action_offset.x = 30; } } - else + else { m_action = actionDragToolbarPane; m_action_window = pane_info->window; @@ -4065,7 +4368,8 @@ void wxAuiManager::OnMotion(wxMouseEvent& event) } else if (m_action == actionDragFloatingPane) { - if(m_action_window) { + if (m_action_window) + { wxPoint pt = m_frame->ClientToScreen(event.GetPosition()); m_action_window->Move(pt.x - m_action_offset.x, pt.y - m_action_offset.y); @@ -4076,7 +4380,7 @@ void wxAuiManager::OnMotion(wxMouseEvent& event) wxAuiPaneInfo& pane = GetPane(m_action_window); wxASSERT_MSG(pane.IsOk(), wxT("Pane window not found")); - pane.state |= wxAuiPaneInfo::actionPane; + pane.SetFlag(wxAuiPaneInfo::actionPane, true); wxPoint pt = event.GetPosition(); DoDrop(m_docks, m_panes, pane, pt, m_action_offset); @@ -4119,22 +4423,22 @@ void wxAuiManager::OnMotion(wxMouseEvent& event) UpdateButtonOnScreen(m_hover_button, event); Repaint(); } - + // mouse is over a button, so repaint the // button in hover mode UpdateButtonOnScreen(part, event); m_hover_button = part; - + } } - else + else { if (m_hover_button) { m_hover_button = NULL; Repaint(); } - else + else { event.Skip(); } @@ -4151,6 +4455,16 @@ void wxAuiManager::OnLeaveWindow(wxMouseEvent& WXUNUSED(event)) } } +void wxAuiManager::OnCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event)) +{ + // cancel the operation in progress, if any + if ( m_action != actionNone ) + { + m_action = actionNone; + HideHint(); + } +} + void wxAuiManager::OnChildFocus(wxChildFocusEvent& event) { // when a child pane has it's focus set, we should change the @@ -4158,7 +4472,8 @@ void wxAuiManager::OnChildFocus(wxChildFocusEvent& event) // active panes are allowed by the owner) if (GetFlags() & wxAUI_MGR_ALLOW_ACTIVE_PANE) { - if (GetPane(event.GetWindow()).IsOk()) + wxAuiPaneInfo& pane = GetPane(event.GetWindow()); + if (pane.IsOk() && (pane.state & wxAuiPaneInfo::optionActive) == 0) { SetActivePane(m_panes, event.GetWindow()); m_frame->Refresh(); @@ -4180,20 +4495,31 @@ void wxAuiManager::OnPaneButton(wxAuiManagerEvent& evt) if (evt.button == wxAUI_BUTTON_CLOSE) { // fire pane close event - wxAuiManagerEvent e(wxEVT_AUI_PANECLOSE); + wxAuiManagerEvent e(wxEVT_AUI_PANE_CLOSE); + e.SetManager(this); e.SetPane(evt.pane); ProcessMgrEvent(e); if (!e.GetVeto()) { - ClosePane(pane); + // close the pane, but check that it + // still exists in our pane array first + // (the event handler above might have removed it) + + wxAuiPaneInfo& check = GetPane(pane.window); + if (check.IsOk()) + { + ClosePane(pane); + } + Update(); } } else if (evt.button == wxAUI_BUTTON_MAXIMIZE_RESTORE && !pane.IsMaximized()) { // fire pane close event - wxAuiManagerEvent e(wxEVT_AUI_PANEMAXIMIZE); + wxAuiManagerEvent e(wxEVT_AUI_PANE_MAXIMIZE); + e.SetManager(this); e.SetPane(evt.pane); ProcessMgrEvent(e); @@ -4206,7 +4532,8 @@ void wxAuiManager::OnPaneButton(wxAuiManagerEvent& evt) else if (evt.button == wxAUI_BUTTON_MAXIMIZE_RESTORE && pane.IsMaximized()) { // fire pane close event - wxAuiManagerEvent e(wxEVT_AUI_PANERESTORE); + wxAuiManagerEvent e(wxEVT_AUI_PANE_RESTORE); + e.SetManager(this); e.SetPane(evt.pane); ProcessMgrEvent(e); @@ -4216,7 +4543,7 @@ void wxAuiManager::OnPaneButton(wxAuiManagerEvent& evt) Update(); } } - else if (evt.button == wxAUI_BUTTON_PIN) + else if (evt.button == wxAUI_BUTTON_PIN) { if ((m_flags & wxAUI_MGR_ALLOW_FLOATING) && pane.IsFloatable())