X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5c62cb6c7dfce1fac3ec9ac23cfef8cd2a043214..ce7208d49d5ce2ca1dc0b3b83f14f1d04f29c4bf:/src/aui/floatpane.cpp diff --git a/src/aui/floatpane.cpp b/src/aui/floatpane.cpp index 0e0c1143eb..5d9c010da2 100644 --- a/src/aui/floatpane.cpp +++ b/src/aui/floatpane.cpp @@ -37,19 +37,21 @@ IMPLEMENT_CLASS( wxFloatingPane, wxFloatingPaneBaseClass ) wxFloatingPane::wxFloatingPane(wxWindow* parent, wxFrameManager* owner_mgr, const wxPaneInfo& pane, - wxWindowID id /*= wxID_ANY*/) + wxWindowID id /*= wxID_ANY*/, + long style /*=wxRESIZE_BORDER | wxSYSTEM_MENU | wxCAPTION | + wxFRAME_NO_TASKBAR | wxFRAME_FLOAT_ON_PARENT | + wxCLIP_CHILDREN + */) : wxFloatingPaneBaseClass(parent, id, wxEmptyString, pane.floating_pos, pane.floating_size, - wxRESIZE_BORDER | wxSYSTEM_MENU | wxCAPTION | - wxCLOSE_BOX | wxFRAME_NO_TASKBAR | - wxFRAME_FLOAT_ON_PARENT | wxCLIP_CHILDREN | + style | + (pane.HasCloseButton()?wxCLOSE_BOX:0) | (pane.IsFixed()?0:wxRESIZE_BORDER) ) { m_owner_mgr = owner_mgr; m_moving = false; - m_last_rect = wxRect(); - m_mgr.SetFrame(this); + m_mgr.SetManagedWindow(this); SetExtraStyle(wxWS_EX_PROCESS_IDLE); } @@ -126,6 +128,9 @@ void wxFloatingPane::OnMoveEvent(wxMoveEvent& event) { wxRect win_rect = GetRect(); + if (win_rect == m_last_rect) + return; + // skip the first move event if (m_last_rect.IsEmpty()) { @@ -133,13 +138,48 @@ void wxFloatingPane::OnMoveEvent(wxMoveEvent& event) return; } + // 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)) + { + m_last3_rect = m_last2_rect; + m_last2_rect = m_last_rect; + m_last_rect = win_rect; + return; + } + // prevent frame redocking during resize if (m_last_rect.GetSize() != win_rect.GetSize()) { + m_last3_rect = m_last2_rect; + m_last2_rect = m_last_rect; m_last_rect = win_rect; return; } + 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) + dir = wxNORTH; + else + dir = wxSOUTH; + } + else + { + if (win_rect.x < m_last3_rect.x) + dir = wxWEST; + else + dir = wxEAST; + } + + m_last3_rect = m_last2_rect; + m_last2_rect = m_last_rect; m_last_rect = win_rect; if (!isMouseDown()) @@ -151,7 +191,10 @@ void wxFloatingPane::OnMoveEvent(wxMoveEvent& event) m_moving = true; } - OnMoving(event.GetRect()); + if (m_last3_rect.IsEmpty()) + return; + + OnMoving(event.GetRect(), dir ); } void wxFloatingPane::OnIdle(wxIdleEvent& event) @@ -176,16 +219,17 @@ void wxFloatingPane::OnMoveStart() m_owner_mgr->OnFloatingPaneMoveStart(m_pane_window); } -void wxFloatingPane::OnMoving(const wxRect& WXUNUSED(window_rect)) +void wxFloatingPane::OnMoving(const wxRect& WXUNUSED(window_rect), wxDirection dir) { // notify the owner manager that the pane is moving - m_owner_mgr->OnFloatingPaneMoving(m_pane_window); + m_owner_mgr->OnFloatingPaneMoving(m_pane_window, dir); + m_lastDirection = dir; } void wxFloatingPane::OnMoveFinished() { // notify the owner manager that the pane has finished moving - m_owner_mgr->OnFloatingPaneMoved(m_pane_window); + m_owner_mgr->OnFloatingPaneMoved(m_pane_window, m_lastDirection); } void wxFloatingPane::OnActivate(wxActivateEvent& event)