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

Removed one of the jumping toolbar artefacts.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2006-08-27 10:10:16 +00:00
parent 5dd7eef7de
commit d1f5ad175c
1 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/aui/framemanager.cpp
View File

@@ -2312,11 +2312,7 @@ bool wxFrameManager::DoDrop(wxDockInfoArray& docks,
if (pt.x < layer_insert_offset && if (pt.x < layer_insert_offset &&
pt.x > layer_insert_offset-auiLayerInsertPixels) pt.x > layer_insert_offset-auiLayerInsertPixels)
{ {
int new_layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_LEFT),
GetMaxLayer(docks, wxAUI_DOCK_BOTTOM)),
GetMaxLayer(docks, wxAUI_DOCK_TOP)) + 1;
drop.Dock().Left(). drop.Dock().Left().
Layer(new_layer).
Row(0). Row(0).
Position(pt.y - GetDockPixelOffset(drop) - offset.y); Position(pt.y - GetDockPixelOffset(drop) - offset.y);
return ProcessDockResult(target, drop); return ProcessDockResult(target, drop);
@@ -2324,11 +2320,7 @@ bool wxFrameManager::DoDrop(wxDockInfoArray& docks,
else if (pt.y < layer_insert_offset && else if (pt.y < layer_insert_offset &&
pt.y > layer_insert_offset-auiLayerInsertPixels) pt.y > layer_insert_offset-auiLayerInsertPixels)
{ {
int new_layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_TOP),
GetMaxLayer(docks, wxAUI_DOCK_LEFT)),
GetMaxLayer(docks, wxAUI_DOCK_RIGHT)) + 1;
drop.Dock().Top(). drop.Dock().Top().
Layer(new_layer).
Row(0). Row(0).
Position(pt.x - GetDockPixelOffset(drop) - offset.x); Position(pt.x - GetDockPixelOffset(drop) - offset.x);
return ProcessDockResult(target, drop); return ProcessDockResult(target, drop);
@@ -2336,11 +2328,7 @@ bool wxFrameManager::DoDrop(wxDockInfoArray& docks,
else if (pt.x >= cli_size.x - layer_insert_offset && else if (pt.x >= cli_size.x - layer_insert_offset &&
pt.x < cli_size.x - layer_insert_offset + auiLayerInsertPixels) pt.x < cli_size.x - layer_insert_offset + auiLayerInsertPixels)
{ {
int new_layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_RIGHT),
GetMaxLayer(docks, wxAUI_DOCK_TOP)),
GetMaxLayer(docks, wxAUI_DOCK_BOTTOM)) + 1;
drop.Dock().Right(). drop.Dock().Right().
Layer(new_layer).
Row(0). Row(0).
Position(pt.y - GetDockPixelOffset(drop) - offset.y); Position(pt.y - GetDockPixelOffset(drop) - offset.y);
return ProcessDockResult(target, drop); return ProcessDockResult(target, drop);
@@ -2348,17 +2336,12 @@ bool wxFrameManager::DoDrop(wxDockInfoArray& docks,
else if (pt.y >= cli_size.y - layer_insert_offset && else if (pt.y >= cli_size.y - layer_insert_offset &&
pt.y < cli_size.y - layer_insert_offset + auiLayerInsertPixels) pt.y < cli_size.y - layer_insert_offset + auiLayerInsertPixels)
{ {
int new_layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_BOTTOM),
GetMaxLayer(docks, wxAUI_DOCK_LEFT)),
GetMaxLayer(docks, wxAUI_DOCK_RIGHT)) + 1;
drop.Dock().Bottom(). drop.Dock().Bottom().
Layer(new_layer).
Row(0). Row(0).
Position(pt.x - GetDockPixelOffset(drop) - offset.x); Position(pt.x - GetDockPixelOffset(drop) - offset.x);
return ProcessDockResult(target, drop); return ProcessDockResult(target, drop);
} }
wxDockUIPart* part = HitTest(pt.x, pt.y); wxDockUIPart* part = HitTest(pt.x, pt.y);