Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

undock/float toolbar if it's dragged right or south of client area

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59959 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Benjamin Williams
2009-03-31 08:32:16 +00:00
parent d8a696fb5f
commit c7928d82c2
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/aui/framemanager.cpp
View File

@@ -3026,7 +3026,8 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks,
// toolbars may only be moved in and to fixed-pane docks, // toolbars may only be moved in and to fixed-pane docks,
// otherwise we will try to float the pane. Also, the pane // otherwise we will try to float the pane. Also, the pane
// should float if being dragged over center pane windows // should float if being dragged over center pane windows
if (!part->dock->fixed || part->dock->dock_direction == wxAUI_DOCK_CENTER) if (!part->dock->fixed || part->dock->dock_direction == wxAUI_DOCK_CENTER ||
pt.x >= cli_size.x || pt.x <= 0 || pt.y >= cli_size.y || pt.y <= 0)
{ {
if (m_last_rect.IsEmpty() || m_last_rect.Contains(pt.x, pt.y )) if (m_last_rect.IsEmpty() || m_last_rect.Contains(pt.x, pt.y ))
{ {
@@ -3034,13 +3035,9 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks,
} }
else else
{ {
if ((m_flags & wxAUI_MGR_ALLOW_FLOATING) && if ((m_flags & wxAUI_MGR_ALLOW_FLOATING) && drop.IsFloatable())
(drop.IsFloatable() ||
(part->dock->dock_direction != wxAUI_DOCK_CENTER &&
part->dock->dock_direction != wxAUI_DOCK_NONE)))
{ {
if (drop.IsFloatable()) drop.Float();
drop.Float();
} }
m_skipping = false; m_skipping = false;