Fixed bug in measure branch height
This commit is contained in:
parent
523eecfc24
commit
7a066cdd72
1 changed files with 14 additions and 11 deletions
|
|
@ -274,16 +274,19 @@ TimelineLayoutHelper::measure_branch_height(
|
||||||
int branch_height = parent_track->get_height() +
|
int branch_height = parent_track->get_height() +
|
||||||
TimelineWidget::TrackPadding;
|
TimelineWidget::TrackPadding;
|
||||||
|
|
||||||
TrackTree::sibling_iterator iterator;
|
// Add the heights of child tracks if this parent is expanded
|
||||||
for(iterator = layoutTree.begin(parent_iterator);
|
if(parent_track->get_expanded())
|
||||||
iterator != layoutTree.end(parent_iterator);
|
|
||||||
iterator++)
|
|
||||||
{
|
{
|
||||||
shared_ptr<timeline::Track> child_track =
|
TrackTree::sibling_iterator iterator;
|
||||||
lookup_timeline_track(*iterator);
|
for(iterator = layoutTree.begin(parent_iterator);
|
||||||
|
iterator != layoutTree.end(parent_iterator);
|
||||||
|
iterator++)
|
||||||
|
{
|
||||||
|
shared_ptr<timeline::Track> child_track =
|
||||||
|
lookup_timeline_track(*iterator);
|
||||||
|
|
||||||
if(child_track->get_expanded())
|
branch_height += measure_branch_height(iterator);
|
||||||
branch_height += measure_branch_height(iterator);
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return branch_height;
|
return branch_height;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue