no changes, just deTAbified and fixed really strange indentation of 'else' statements
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -2950,20 +2950,16 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks,
|
||||
|
||||
insert_layer = 0;
|
||||
insert_dock_row = true;
|
||||
if (pt.x >= part->rect.x &&
|
||||
pt.x < part->rect.x+new_row_pixels_x)
|
||||
const wxRect& pr = part->rect;
|
||||
if (pt.x >= pr.x && pt.x < pr.x + new_row_pixels_x)
|
||||
insert_dir = wxAUI_DOCK_LEFT;
|
||||
else
|
||||
if (pt.y >= part->rect.y &&
|
||||
pt.y < part->rect.y+new_row_pixels_y)
|
||||
else if (pt.y >= pr.y && pt.y < pr.y + new_row_pixels_y)
|
||||
insert_dir = wxAUI_DOCK_TOP;
|
||||
else
|
||||
if (pt.x >= part->rect.x + part->rect.width-new_row_pixels_x &&
|
||||
pt.x < part->rect.x + part->rect.width)
|
||||
else if (pt.x >= pr.x + pr.width - new_row_pixels_x &&
|
||||
pt.x < pr.x + pr.width)
|
||||
insert_dir = wxAUI_DOCK_RIGHT;
|
||||
else
|
||||
if (pt.y >= part->rect.y+ part->rect.height-new_row_pixels_y &&
|
||||
pt.y < part->rect.y + part->rect.height)
|
||||
else if (pt.y >= pr.y+ pr.height - new_row_pixels_y &&
|
||||
pt.y < pr.y + pr.height)
|
||||
insert_dir = wxAUI_DOCK_BOTTOM;
|
||||
else
|
||||
return false;
|
||||
@@ -3327,22 +3323,22 @@ void wxAuiManager::OnFloatingPaneMoving(wxWindow* wnd, wxDirection dir)
|
||||
pt.y = pos.y;
|
||||
// and some more pixels for the title bar
|
||||
pt.y -= 5;
|
||||
} else
|
||||
if (dir == wxWEST)
|
||||
}
|
||||
else if (dir == wxWEST)
|
||||
{
|
||||
// move to pane's left border
|
||||
wxPoint pos( 0,0 );
|
||||
pos = wnd->ClientToScreen( pos );
|
||||
pt.x = pos.x;
|
||||
} else
|
||||
if (dir == wxEAST)
|
||||
}
|
||||
else if (dir == wxEAST)
|
||||
{
|
||||
// move to pane's right border
|
||||
wxPoint pos( wnd->GetSize().x, 0 );
|
||||
pos = wnd->ClientToScreen( pos );
|
||||
pt.x = pos.x;
|
||||
} else
|
||||
if (dir == wxSOUTH)
|
||||
}
|
||||
else if (dir == wxSOUTH)
|
||||
{
|
||||
// move to pane's bottom border
|
||||
wxPoint pos( 0, wnd->GetSize().y );
|
||||
@@ -3430,22 +3426,22 @@ void wxAuiManager::OnFloatingPaneMoved(wxWindow* wnd, wxDirection dir)
|
||||
pt.y = pos.y;
|
||||
// and some more pixels for the title bar
|
||||
pt.y -= 10;
|
||||
} else
|
||||
if (dir == wxWEST)
|
||||
}
|
||||
else if (dir == wxWEST)
|
||||
{
|
||||
// move to pane's left border
|
||||
wxPoint pos( 0,0 );
|
||||
pos = wnd->ClientToScreen( pos );
|
||||
pt.x = pos.x;
|
||||
} else
|
||||
if (dir == wxEAST)
|
||||
}
|
||||
else if (dir == wxEAST)
|
||||
{
|
||||
// move to pane's right border
|
||||
wxPoint pos( wnd->GetSize().x, 0 );
|
||||
pos = wnd->ClientToScreen( pos );
|
||||
pt.x = pos.x;
|
||||
} else
|
||||
if (dir == wxSOUTH)
|
||||
}
|
||||
else if (dir == wxSOUTH)
|
||||
{
|
||||
// move to pane's bottom border
|
||||
wxPoint pos( 0, wnd->GetSize().y );
|
||||
|
Reference in New Issue
Block a user