X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a3a5df9d92fe2b22a7451e1251f1711064c22d67..3225a4b8b8656f25dac6cb20684a3c2c273cf796:/src/aui/floatpane.cpp diff --git a/src/aui/floatpane.cpp b/src/aui/floatpane.cpp index 825d85dc12..05740acecb 100644 --- a/src/aui/floatpane.cpp +++ b/src/aui/floatpane.cpp @@ -36,21 +36,21 @@ #include "wx/msw/private.h" #endif -IMPLEMENT_CLASS( wxAuiFloatingPane, wxAuiFloatingPaneBaseClass ) +IMPLEMENT_CLASS(wxAuiFloatingFrame, wxAuiFloatingFrameBaseClass) -wxAuiFloatingPane::wxAuiFloatingPane(wxWindow* parent, +wxAuiFloatingFrame::wxAuiFloatingFrame(wxWindow* parent, wxAuiManager* owner_mgr, const wxAuiPaneInfo& pane, wxWindowID id /*= wxID_ANY*/, long style /*=wxRESIZE_BORDER | wxSYSTEM_MENU | wxCAPTION | - wxFRAME_NO_TASKBAR | wxFRAME_FLOAT_ON_PARENT | + wxFRAME_NO_TASKBAR | wxFRAME_FLOAT_ON_PARENT | wxCLIP_CHILDREN */) - : wxAuiFloatingPaneBaseClass(parent, id, wxEmptyString, + : wxAuiFloatingFrameBaseClass(parent, id, wxEmptyString, pane.floating_pos, pane.floating_size, - style | + style | (pane.HasCloseButton()?wxCLOSE_BOX:0) | - (pane.HasMaximizeButton()?wxMAXIMIZE:0) | + (pane.HasMaximizeButton()?wxMAXIMIZE_BOX:0) | (pane.IsFixed()?0:wxRESIZE_BORDER) ) { @@ -58,7 +58,7 @@ wxAuiFloatingPane::wxAuiFloatingPane(wxWindow* parent, m_moving = false; m_mgr.SetManagedWindow(this); m_solid_drag = true; - + // find out if the system supports solid window drag. // on non-msw systems, this is assumed to be the case #ifdef __WXMSW__ @@ -66,20 +66,22 @@ wxAuiFloatingPane::wxAuiFloatingPane(wxWindow* parent, SystemParametersInfo(38 /*SPI_GETDRAGFULLWINDOWS*/, 0, &b, 0); m_solid_drag = b ? true : false; #endif - + SetExtraStyle(wxWS_EX_PROCESS_IDLE); } -wxAuiFloatingPane::~wxAuiFloatingPane() +wxAuiFloatingFrame::~wxAuiFloatingFrame() { // if we do not do this, then we can crash... - if(m_owner_mgr && m_owner_mgr->m_action_window == this) { + if (m_owner_mgr && m_owner_mgr->m_action_window == this) + { m_owner_mgr->m_action_window = NULL; } + m_mgr.UnInit(); } -void wxAuiFloatingPane::SetPaneWindow(const wxAuiPaneInfo& pane) +void wxAuiFloatingFrame::SetPaneWindow(const wxAuiPaneInfo& pane) { m_pane_window = pane.window; m_pane_window->Reparent(this); @@ -91,6 +93,19 @@ void wxAuiFloatingPane::SetPaneWindow(const wxAuiPaneInfo& pane) Layer(0).Row(0).Position(0); // Carry over the minimum size + wxSize pane_min_size = pane.window->GetMinSize(); + + // if the frame window's max size is greater than the min size + // then set the max size to the min size as well + wxSize cur_max_size = GetMaxSize(); + if (cur_max_size.IsFullySpecified() && + (cur_max_size.x < pane.min_size.x || + cur_max_size.y < pane.min_size.y) + ) + { + SetMaxSize(pane_min_size); + } + SetMinSize(pane.window->GetMinSize()); m_mgr.AddPane(m_pane_window, contained_pane); @@ -108,42 +123,72 @@ void wxAuiFloatingPane::SetPaneWindow(const wxAuiPaneInfo& pane) SetTitle(pane.caption); - if (pane.floating_size != wxDefaultSize) + // This code is slightly awkward because we need to reset wxRESIZE_BORDER + // before calling SetClientSize() below as doing it after setting the + // client size would actually change it, at least under MSW, where the + // total window size doesn't change and hence, as the borders size changes, + // the client size does change. + // + // So we must call it first but doing it generates a size event and updates + // pane.floating_size from inside it so we must also record its original + // value before doing it. + const bool hasFloatingSize = pane.floating_size != wxDefaultSize; + if (pane.IsFixed()) + { + SetWindowStyleFlag(GetWindowStyleFlag() & ~wxRESIZE_BORDER); + } + + if ( hasFloatingSize ) { SetSize(pane.floating_size); } - else + else { wxSize size = pane.best_size; if (size == wxDefaultSize) size = pane.min_size; if (size == wxDefaultSize) size = m_pane_window->GetSize(); - if (pane.HasGripper()) + if (m_owner_mgr && pane.HasGripper()) { if (pane.HasGripperTop()) - size.y += m_owner_mgr->m_art->GetMetric(wxAUI_ART_GRIPPER_SIZE); + size.y += m_owner_mgr->m_art->GetMetric(wxAUI_DOCKART_GRIPPER_SIZE); else - size.x += m_owner_mgr->m_art->GetMetric(wxAUI_ART_GRIPPER_SIZE); + size.x += m_owner_mgr->m_art->GetMetric(wxAUI_DOCKART_GRIPPER_SIZE); } SetClientSize(size); } } -void wxAuiFloatingPane::OnSize(wxSizeEvent& event) +wxAuiManager* wxAuiFloatingFrame::GetOwnerManager() const +{ + return m_owner_mgr; +} + + +void wxAuiFloatingFrame::OnSize(wxSizeEvent& WXUNUSED(event)) { - m_owner_mgr->OnFloatingPaneResized(m_pane_window, event.GetSize()); + if (m_owner_mgr) + { + m_owner_mgr->OnFloatingPaneResized(m_pane_window, GetRect()); + } } -void wxAuiFloatingPane::OnClose(wxCloseEvent& evt) +void wxAuiFloatingFrame::OnClose(wxCloseEvent& evt) { - m_owner_mgr->OnFloatingPaneClosed(m_pane_window, evt); + if (m_owner_mgr) + { + m_owner_mgr->OnFloatingPaneClosed(m_pane_window, evt); + } if (!evt.GetVeto()) + { + m_mgr.DetachPane(m_pane_window); Destroy(); + } } -void wxAuiFloatingPane::OnMoveEvent(wxMoveEvent& event) +void wxAuiFloatingFrame::OnMoveEvent(wxMoveEvent& event) { if (!m_solid_drag) { @@ -157,8 +202,8 @@ void wxAuiFloatingPane::OnMoveEvent(wxMoveEvent& event) m_moving = true; return; } - - + + wxRect win_rect = GetRect(); if (win_rect == m_last_rect) @@ -171,7 +216,7 @@ void wxAuiFloatingPane::OnMoveEvent(wxMoveEvent& event) return; } - // skip if moving too fast to avoid massive redraws and + // skip if moving too fast to avoid massive redraws and // jumping hint windows if ((abs(win_rect.x - m_last_rect.x) > 3) || (abs(win_rect.y - m_last_rect.y) > 3)) @@ -179,6 +224,15 @@ void wxAuiFloatingPane::OnMoveEvent(wxMoveEvent& event) m_last3_rect = m_last2_rect; m_last2_rect = m_last_rect; m_last_rect = win_rect; + + // However still update the internally stored position to avoid + // snapping back to the old one later. + if (m_owner_mgr) + { + m_owner_mgr->GetPane(m_pane_window). + floating_pos = win_rect.GetPosition(); + } + return; } @@ -192,10 +246,10 @@ void wxAuiFloatingPane::OnMoveEvent(wxMoveEvent& event) } wxDirection dir = wxALL; - + int horiz_dist = abs(win_rect.x - m_last3_rect.x); int vert_dist = abs(win_rect.y - m_last3_rect.y); - + if (vert_dist >= horiz_dist) { if (win_rect.y < m_last3_rect.y) @@ -210,7 +264,7 @@ void wxAuiFloatingPane::OnMoveEvent(wxMoveEvent& event) else dir = wxEAST; } - + m_last3_rect = m_last2_rect; m_last2_rect = m_last_rect; m_last_rect = win_rect; @@ -226,11 +280,11 @@ void wxAuiFloatingPane::OnMoveEvent(wxMoveEvent& event) if (m_last3_rect.IsEmpty()) return; - + OnMoving(event.GetRect(), dir); } -void wxAuiFloatingPane::OnIdle(wxIdleEvent& event) +void wxAuiFloatingFrame::OnIdle(wxIdleEvent& event) { if (m_moving) { @@ -239,35 +293,44 @@ void wxAuiFloatingPane::OnIdle(wxIdleEvent& event) m_moving = false; OnMoveFinished(); } - else + else { event.RequestMore(); } } } -void wxAuiFloatingPane::OnMoveStart() +void wxAuiFloatingFrame::OnMoveStart() { // notify the owner manager that the pane has started to move - m_owner_mgr->OnFloatingPaneMoveStart(m_pane_window); + if (m_owner_mgr) + { + m_owner_mgr->OnFloatingPaneMoveStart(m_pane_window); + } } -void wxAuiFloatingPane::OnMoving(const wxRect& WXUNUSED(window_rect), wxDirection dir) +void wxAuiFloatingFrame::OnMoving(const wxRect& WXUNUSED(window_rect), wxDirection dir) { // notify the owner manager that the pane is moving - m_owner_mgr->OnFloatingPaneMoving(m_pane_window, dir); + if (m_owner_mgr) + { + m_owner_mgr->OnFloatingPaneMoving(m_pane_window, dir); + } m_lastDirection = dir; } -void wxAuiFloatingPane::OnMoveFinished() +void wxAuiFloatingFrame::OnMoveFinished() { // notify the owner manager that the pane has finished moving - m_owner_mgr->OnFloatingPaneMoved(m_pane_window, m_lastDirection); + if (m_owner_mgr) + { + m_owner_mgr->OnFloatingPaneMoved(m_pane_window, m_lastDirection); + } } -void wxAuiFloatingPane::OnActivate(wxActivateEvent& event) +void wxAuiFloatingFrame::OnActivate(wxActivateEvent& event) { - if (event.GetActive()) + if (m_owner_mgr && event.GetActive()) { m_owner_mgr->OnFloatingPaneActivated(m_pane_window); } @@ -277,19 +340,19 @@ void wxAuiFloatingPane::OnActivate(wxActivateEvent& event) // (independant of having a wxMouseEvent handy) - utimately a better // mechanism for this should be found (possibly by adding the // functionality to wxWidgets itself) -bool wxAuiFloatingPane::isMouseDown() +bool wxAuiFloatingFrame::isMouseDown() { - return wxGetMouseState().LeftDown(); + return wxGetMouseState().LeftIsDown(); } -BEGIN_EVENT_TABLE(wxAuiFloatingPane, wxAuiFloatingPaneBaseClass) - EVT_SIZE(wxAuiFloatingPane::OnSize) - EVT_MOVE(wxAuiFloatingPane::OnMoveEvent) - EVT_MOVING(wxAuiFloatingPane::OnMoveEvent) - EVT_CLOSE(wxAuiFloatingPane::OnClose) - EVT_IDLE(wxAuiFloatingPane::OnIdle) - EVT_ACTIVATE(wxAuiFloatingPane::OnActivate) +BEGIN_EVENT_TABLE(wxAuiFloatingFrame, wxAuiFloatingFrameBaseClass) + EVT_SIZE(wxAuiFloatingFrame::OnSize) + EVT_MOVE(wxAuiFloatingFrame::OnMoveEvent) + EVT_MOVING(wxAuiFloatingFrame::OnMoveEvent) + EVT_CLOSE(wxAuiFloatingFrame::OnClose) + EVT_IDLE(wxAuiFloatingFrame::OnIdle) + EVT_ACTIVATE(wxAuiFloatingFrame::OnActivate) END_EVENT_TABLE()