ichthyo/LUMIERA.clone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Misc tidy-ups

Browse source
This commit is contained in:
Joel Holdsworth 2008-12-10 18:09:01 +00:00
parent 7c1046e162
commit d61daa0b2f
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/gui/widgets/timeline-widget.cpp
View file

@ -284,7 +284,8 @@ TimelineWidget::update_tracks()
// Recalculate the total height of the timeline scrolled area
totalHeight = 0;
BOOST_FOREACH(shared_ptr<model::Track> track, sequence->get_child_tracks())
BOOST_FOREACH(shared_ptr<model::Track> track,
sequence->get_child_tracks())
{
ASSERT(track);
totalHeight += measure_branch_height(track);
@ -296,8 +297,9 @@ TimelineWidget::create_timeline_tracks()
{
REQUIRE(sequence);
BOOST_FOREACH(shared_ptr<model::Track> child, sequence->get_child_tracks())
create_timeline_tracks_from_branch(child);
BOOST_FOREACH(shared_ptr<model::Track> child,
sequence->get_child_tracks())
create_timeline_tracks_from_branch(sequence);
}
void
@ -416,8 +418,11 @@ TimelineWidget::measure_branch_height(
// Recurse through all the children
BOOST_FOREACH( shared_ptr<model::Track> child,
model_track->get_child_tracks() )
height += measure_branch_height(child);
{
ASSERT(child != NULL);
height += measure_branch_height(child);
}
return height;
}

2
src/gui/widgets/timeline/timeline-header-container.cpp
View file

@ -70,7 +70,7 @@ TimelineHeaderContainer::update_headers()
{
// Add fresh headers
BOOST_FOREACH( shared_ptr<model::Track> model_track, get_tracks() )
set_parent_recursive(model_track);
set_parent_recursive(model_track);
}
void