ardour/livetrax
13
0
Fork 0
Code

canvas: correctly set Box _rect after repositioning children

Browse Source
This commit is contained in:
Paul Davis 2021-07-27 17:06:32 -06:00
parent da3ea7e236
commit 85edd83338
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libs/canvas/box.cc
View File

@ -172,6 +172,8 @@ Box::reposition_children ()
uniform_size = Rect (0, 0, largest_width, largest_height);
}
Rect r;
{
PBD::Unwinder<bool> uw (ignore_child_changes, true);
@ -189,6 +191,8 @@ Box::reposition_children ()
(*i)->size_request (width, height);
r = r.extend (Rect (previous_edge.x, previous_edge.y, previous_edge.x + width, previous_edge.y + height));
if (orientation == Vertical) {
Distance shift = 0;
@ -222,7 +226,11 @@ Box::reposition_children ()
}
}
_bounding_box_dirty = true;
/* left and top margins+padding already reflected in child bboxes */
r = r.expand (0, right_margin + right_padding, bottom_margin + bottom_padding, 0);
set (r);
}
void
@ -256,14 +264,6 @@ Box::layout ()
if (yes_do_it) {
reposition_children ();
(void) bounding_box ();
const double w = std::max (requested_width, _bounding_box.width());
const double h = std::max (requested_height, _bounding_box.height());
set (Rect (get().x0, get().y0, get().x0 + w, get().y0 + h));
std::cerr << name << " box layed out, reset to " << get() << std::endl;
}
}