X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bc07ab17bf5370f452e899128bf89cc7ca7b98f0..9572bf1d442006beba3528dc00c3fc05eb523c24:/src/aui/floatpane.cpp diff --git a/src/aui/floatpane.cpp b/src/aui/floatpane.cpp index 1ee980a298..99e80894e3 100644 --- a/src/aui/floatpane.cpp +++ b/src/aui/floatpane.cpp @@ -43,12 +43,12 @@ wxAuiFloatingFrame::wxAuiFloatingFrame(wxWindow* parent, 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 */) : wxAuiFloatingFrameBaseClass(parent, id, wxEmptyString, pane.floating_pos, pane.floating_size, - style | + style | (pane.HasCloseButton()?wxCLOSE_BOX:0) | (pane.HasMaximizeButton()?wxMAXIMIZE_BOX:0) | (pane.IsFixed()?0:wxRESIZE_BORDER) @@ -58,7 +58,7 @@ wxAuiFloatingFrame::wxAuiFloatingFrame(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,17 +66,18 @@ wxAuiFloatingFrame::wxAuiFloatingFrame(wxWindow* parent, SystemParametersInfo(38 /*SPI_GETDRAGFULLWINDOWS*/, 0, &b, 0); m_solid_drag = b ? true : false; #endif - + SetExtraStyle(wxWS_EX_PROCESS_IDLE); } 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(); } @@ -93,16 +94,18 @@ void wxAuiFloatingFrame::SetPaneWindow(const wxAuiPaneInfo& pane) // 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.x < pane.min_size.x || - cur_max_size.y < pane.min_size.y) + 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); @@ -124,14 +127,14 @@ void wxAuiFloatingFrame::SetPaneWindow(const wxAuiPaneInfo& pane) { 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_DOCKART_GRIPPER_SIZE); @@ -141,6 +144,11 @@ void wxAuiFloatingFrame::SetPaneWindow(const wxAuiPaneInfo& pane) SetClientSize(size); } + + if (pane.IsFixed()) + { + SetWindowStyleFlag(GetWindowStyleFlag() & ~wxRESIZE_BORDER); + } } wxAuiManager* wxAuiFloatingFrame::GetOwnerManager() const @@ -149,16 +157,25 @@ wxAuiManager* wxAuiFloatingFrame::GetOwnerManager() const } -void wxAuiFloatingFrame::OnSize(wxSizeEvent& event) +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 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 wxAuiFloatingFrame::OnMoveEvent(wxMoveEvent& event) @@ -175,8 +192,8 @@ void wxAuiFloatingFrame::OnMoveEvent(wxMoveEvent& event) m_moving = true; return; } - - + + wxRect win_rect = GetRect(); if (win_rect == m_last_rect) @@ -189,7 +206,7 @@ void wxAuiFloatingFrame::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)) @@ -210,10 +227,10 @@ void wxAuiFloatingFrame::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) @@ -228,7 +245,7 @@ void wxAuiFloatingFrame::OnMoveEvent(wxMoveEvent& event) else dir = wxEAST; } - + m_last3_rect = m_last2_rect; m_last2_rect = m_last_rect; m_last_rect = win_rect; @@ -244,7 +261,7 @@ void wxAuiFloatingFrame::OnMoveEvent(wxMoveEvent& event) if (m_last3_rect.IsEmpty()) return; - + OnMoving(event.GetRect(), dir); } @@ -257,7 +274,7 @@ void wxAuiFloatingFrame::OnIdle(wxIdleEvent& event) m_moving = false; OnMoveFinished(); } - else + else { event.RequestMore(); } @@ -267,25 +284,34 @@ void wxAuiFloatingFrame::OnIdle(wxIdleEvent& event) 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 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 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 wxAuiFloatingFrame::OnActivate(wxActivateEvent& event) { - if (event.GetActive()) + if (m_owner_mgr && event.GetActive()) { m_owner_mgr->OnFloatingPaneActivated(m_pane_window); } @@ -297,7 +323,7 @@ void wxAuiFloatingFrame::OnActivate(wxActivateEvent& event) // functionality to wxWidgets itself) bool wxAuiFloatingFrame::isMouseDown() { - return wxGetMouseState().LeftDown(); + return wxGetMouseState().LeftIsDown(); }