Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-05 00:23:56 +01:00
Code Issues Releases Wiki Activity

Improved algorithm for rearranging toolbars after docking one...

Browse Source 
... A double-height bar can now insert left of two stacked single-height bars.

For instance you can un-dock the Tools toolbar from the default setup, then
drag it back, and now get the same result as you started with.
This commit is contained in:
Paul Licameli
2018-01-22 00:14:52 -05:00
parent 2b5a8682a1
commit fb101964df
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/toolbars/ToolDock.cpp
View File

@@ -147,22 +147,27 @@ void ToolBarConfiguration::Insert(ToolBar *bar, Position position)
// Insert as a leaf, or as an internal node?
if (adopt && position.adopt) {
// Existing child of parent become its grandchild
// TODO: is it ever correct to adopt more than one, depending on
// heights? Could an inserted tall bar adopt two short ones?
// Existing children of parent become grandchildren
// Make NEW node
Tree tree;
tree.pBar = bar;
// Do adoption
tree.children.push_back(Tree{});
auto &child = tree.children.back();
child.pBar = iter->pBar;
child.children.swap(iter->children);
const auto barHeight = bar->GetSize().GetY() + toolbarGap;
auto totalHeight = 0;
while (iter != pForest->end() &&
barHeight >=
(totalHeight += (iter->pBar->GetSize().GetY() + toolbarGap))) {
tree.children.push_back(Tree{});
auto &child = tree.children.back();
child.pBar = iter->pBar;
child.children.swap(iter->children);
iter = pForest->erase(iter);
}
// Put the node in the tree
iter = pForest->insert(iter, Tree{});
(*iter).swap(tree);
}
else