#ifndef WX_PRECOMP
#endif
-IMPLEMENT_CLASS( wxFloatingPane, wxFloatingPaneBaseClass )
+#ifdef __WXMSW__
+#include "wx/msw/private.h"
+#endif
-wxFloatingPane::wxFloatingPane(wxWindow* parent,
- wxFrameManager* owner_mgr,
- const wxPaneInfo& pane,
- wxWindowID id /*= wxID_ANY*/)
- : wxFloatingPaneBaseClass(parent, id, wxEmptyString,
+IMPLEMENT_CLASS(wxAuiFloatingFrame, wxAuiFloatingFrameBaseClass)
+
+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 |
+ wxCLIP_CHILDREN
+ */)
+ : wxAuiFloatingFrameBaseClass(parent, id, wxEmptyString,
pane.floating_pos, pane.floating_size,
- wxRESIZE_BORDER | wxSYSTEM_MENU | wxCAPTION |
+ style |
(pane.HasCloseButton()?wxCLOSE_BOX:0) |
- wxFRAME_NO_TASKBAR |
- wxFRAME_FLOAT_ON_PARENT | wxCLIP_CHILDREN |
+ (pane.HasMaximizeButton()?wxMAXIMIZE_BOX:0) |
(pane.IsFixed()?0:wxRESIZE_BORDER)
)
{
m_owner_mgr = owner_mgr;
m_moving = false;
- m_last_rect = wxRect();
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__
+ BOOL b = TRUE;
+ SystemParametersInfo(38 /*SPI_GETDRAGFULLWINDOWS*/, 0, &b, 0);
+ m_solid_drag = b ? true : false;
+#endif
+
SetExtraStyle(wxWS_EX_PROCESS_IDLE);
}
-wxFloatingPane::~wxFloatingPane()
+wxAuiFloatingFrame::~wxAuiFloatingFrame()
{
+ // if we do not do this, then we can crash...
+ if(m_owner_mgr && m_owner_mgr->m_action_window == this)
+ {
+ m_owner_mgr->m_action_window = NULL;
+ }
m_mgr.UnInit();
}
-void wxFloatingPane::SetPaneWindow(const wxPaneInfo& pane)
+void wxAuiFloatingFrame::SetPaneWindow(const wxAuiPaneInfo& pane)
{
m_pane_window = pane.window;
m_pane_window->Reparent(this);
- wxPaneInfo contained_pane = pane;
+ wxAuiPaneInfo contained_pane = pane;
contained_pane.Dock().Center().Show().
CaptionVisible(false).
PaneBorder(false).
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);
{
SetSize(pane.floating_size);
}
- else
+ else
{
wxSize size = pane.best_size;
if (size == wxDefaultSize)
if (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 wxFloatingPane::OnSize(wxSizeEvent& event)
+wxAuiManager* wxAuiFloatingFrame::GetOwnerManager() const
+{
+ return m_owner_mgr;
+}
+
+
+void wxAuiFloatingFrame::OnSize(wxSizeEvent& event)
{
m_owner_mgr->OnFloatingPaneResized(m_pane_window, event.GetSize());
}
-void wxFloatingPane::OnClose(wxCloseEvent& evt)
+void wxAuiFloatingFrame::OnClose(wxCloseEvent& evt)
{
m_owner_mgr->OnFloatingPaneClosed(m_pane_window, evt);
- if (!evt.GetVeto())
+ if (!evt.GetVeto()) {
+ m_mgr.DetachPane(m_pane_window);
Destroy();
+ }
}
-void wxFloatingPane::OnMoveEvent(wxMoveEvent& event)
+void wxAuiFloatingFrame::OnMoveEvent(wxMoveEvent& event)
{
-#ifdef __WXGTK__
- // On wxGTK 2.6 and 2.7 for some unknown reason, wxSizeEvents are not
- // emitted for wxFloatingPanes when they are manually resized.
- // See Bug #1528554.
- // However, it does (fortunately) wrongly emit wxMoveEvent in this scenario.
- // So we having on that to update the floating pane size - let's hope noone
- // fixes this useful bug, without fixing the above.
- m_owner_mgr->OnFloatingPaneResized(m_pane_window, GetSize());
-#endif
+ if (!m_solid_drag)
+ {
+ // systems without solid window dragging need to be
+ // handled slightly differently, due to the lack of
+ // the constant stream of EVT_MOVING events
+ if (!isMouseDown())
+ return;
+ OnMoveStart();
+ OnMoving(event.GetRect(), wxNORTH);
+ m_moving = true;
+ return;
+ }
+
wxRect win_rect = GetRect();
+ if (win_rect == m_last_rect)
+ return;
+
// skip the first move event
if (m_last_rect.IsEmpty())
{
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())
m_moving = true;
}
- OnMoving(event.GetRect());
+ if (m_last3_rect.IsEmpty())
+ return;
+
+ OnMoving(event.GetRect(), dir);
}
-void wxFloatingPane::OnIdle(wxIdleEvent& event)
+void wxAuiFloatingFrame::OnIdle(wxIdleEvent& event)
{
if (m_moving)
{
m_moving = false;
OnMoveFinished();
}
- else
+ else
{
event.RequestMore();
}
}
}
-void wxFloatingPane::OnMoveStart()
+void wxAuiFloatingFrame::OnMoveStart()
{
// notify the owner manager that the pane has started to move
m_owner_mgr->OnFloatingPaneMoveStart(m_pane_window);
}
-void wxFloatingPane::OnMoving(const wxRect& WXUNUSED(window_rect))
+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);
+ m_owner_mgr->OnFloatingPaneMoving(m_pane_window, dir);
+ m_lastDirection = dir;
}
-void wxFloatingPane::OnMoveFinished()
+void wxAuiFloatingFrame::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)
+void wxAuiFloatingFrame::OnActivate(wxActivateEvent& event)
{
if (event.GetActive())
{
// (independant of having a wxMouseEvent handy) - utimately a better
// mechanism for this should be found (possibly by adding the
// functionality to wxWidgets itself)
-bool wxFloatingPane::isMouseDown()
+bool wxAuiFloatingFrame::isMouseDown()
{
return wxGetMouseState().LeftDown();
}
-BEGIN_EVENT_TABLE(wxFloatingPane, wxFloatingPaneBaseClass)
- EVT_SIZE(wxFloatingPane::OnSize)
- EVT_MOVE(wxFloatingPane::OnMoveEvent)
- EVT_MOVING(wxFloatingPane::OnMoveEvent)
- EVT_CLOSE(wxFloatingPane::OnClose)
- EVT_IDLE(wxFloatingPane::OnIdle)
- EVT_ACTIVATE(wxFloatingPane::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()
projects / wxWidgets.git / blobdiff