X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/50acee04cdaf2fec9f3fa4cd0035ff2d9ed7d53a..ce7208d49d5ce2ca1dc0b3b83f14f1d04f29c4bf:/src/aui/floatpane.cpp

diff --git a/src/aui/floatpane.cpp b/src/aui/floatpane.cpp
index 13cba0343b..5d9c010da2 100644
--- a/src/aui/floatpane.cpp
+++ b/src/aui/floatpane.cpp
@@ -1,10 +1,10 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        floatpane.cpp
+// Name:        src/aui/floatpane.cpp
 // Purpose:     wxaui: wx advanced user interface - docking window manager
 // Author:      Benjamin I. Williams
 // Modified by:
 // Created:     2005-05-17
-// RCS-ID:      
+// RCS-ID:      $Id$
 // Copyright:   (C) Copyright 2005-2006, Kirix Corporation, All Rights Reserved
 // Licence:     wxWindows Library Licence, Version 3.1
 ///////////////////////////////////////////////////////////////////////////////
@@ -30,23 +30,28 @@
 #include "wx/aui/dockart.h"
 
 #ifndef WX_PRECOMP
-//    #include "wx/log.h"
 #endif
 
+IMPLEMENT_CLASS( wxFloatingPane, wxFloatingPaneBaseClass )
+
 wxFloatingPane::wxFloatingPane(wxWindow* parent,
                 wxFrameManager* owner_mgr,
-                wxWindowID id /*= -1*/,
-                const wxPoint& pos /*= wxDefaultPosition*/,
-                const wxSize& size /*= wxDefaultSize*/)
-                : wxFloatingPaneBaseClass(parent, id, wxT(""), pos, size,
-                        wxRESIZE_BORDER | wxSYSTEM_MENU | wxCAPTION |
-                        wxCLOSE_BOX | wxFRAME_NO_TASKBAR |
-                        wxFRAME_FLOAT_ON_PARENT | wxCLIP_CHILDREN)
+                const wxPaneInfo& pane,
+                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,
+                        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);
 }
 
@@ -59,15 +64,18 @@ void wxFloatingPane::SetPaneWindow(const wxPaneInfo& pane)
 {
     m_pane_window = pane.window;
     m_pane_window->Reparent(this);
-    
+
     wxPaneInfo contained_pane = pane;
     contained_pane.Dock().Center().Show().
                     CaptionVisible(false).
                     PaneBorder(false).
                     Layer(0).Row(0).Position(0);
-                                            
+
+    // Carry over the minimum size
+    SetMinSize(pane.window->GetMinSize());
+
     m_mgr.AddPane(m_pane_window, contained_pane);
-    m_mgr.Update();           
+    m_mgr.Update();
 
     if (pane.min_size.IsFullySpecified())
     {
@@ -78,11 +86,8 @@ void wxFloatingPane::SetPaneWindow(const wxPaneInfo& pane)
         GetSizer()->SetSizeHints(this);
         SetSize(tmp);
     }
-    
-    SetTitle(pane.caption);
 
-    if (contained_pane.IsFixed())
-        SetWindowStyle(GetWindowStyle() & ~wxRESIZE_BORDER);
+    SetTitle(pane.caption);
 
     if (pane.floating_size != wxDefaultSize)
     {
@@ -102,7 +107,7 @@ void wxFloatingPane::SetPaneWindow(const wxPaneInfo& pane)
             else
                 size.x += m_owner_mgr->m_art->GetMetric(wxAUI_ART_GRIPPER_SIZE);
         }
-            
+
         SetClientSize(size);
     }
 }
@@ -112,16 +117,20 @@ void wxFloatingPane::OnSize(wxSizeEvent& event)
     m_owner_mgr->OnFloatingPaneResized(m_pane_window, event.GetSize());
 }
 
-void wxFloatingPane::OnClose(wxCloseEvent& WXUNUSED(event))
+void wxFloatingPane::OnClose(wxCloseEvent& evt)
 {
-    m_owner_mgr->OnFloatingPaneClosed(m_pane_window);
-    Destroy();
+    m_owner_mgr->OnFloatingPaneClosed(m_pane_window, evt);
+    if (!evt.GetVeto())
+        Destroy();
 }
 
 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())
     {
@@ -129,15 +138,50 @@ 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;
     }
 
-    m_last_rect = win_rect;
+    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())
         return;
 
@@ -147,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)
@@ -172,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)