Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-12-09 06:06:24 +01:00
Code Issues Releases Wiki Activity

Toolbar placements can push other bars down as well as right

Browse Source
This commit is contained in:
Paul Licameli
2016-06-12 19:10:53 -04:00
parent 37962dd9a8
commit de17c1ac3a
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/toolbars/ToolDock.cpp
View File

@@ -688,10 +688,16 @@ ToolBarConfiguration::Position
if (rect.Contains(point))
{
sz = tb->GetDockedSize();
// Choose this position always, if there is a bar to displace.
// Choose a position always, if there is a bar to displace.
// Else, only if the fit is possible.
if (ct || (sz.x < rect.width && sz.y < rect.height))
result = position;
if (ct || (sz.x <= rect.width && sz.y <= rect.height)) {
// May choose current or previous.
if (ct && point.y < (rect.GetTop() + rect.GetBottom()) / 2)
// "Wedge" the bar into a crack alone, not adopting others
usedPrev = true, result = prevPosition, result.adopt = false;
else
result = position;
}
// Now wait until the other callback below to discover x and y
}
}
@@ -704,6 +710,8 @@ ToolBarConfiguration::Position
// If we've placed it, we're done.
rect.x = point.x;
rect.y = point.y;
if (usedPrev)
rect.y -= tb->GetDockedSize().GetHeight() / 2;
throw Stop {};
}
@@ -731,6 +739,7 @@ ToolBarConfiguration::Position
wxRect &rect;
const wxPoint point;
ToolBar *const tb;
bool usedPrev { false };
} inserter {
result, rect, pos, t
};