Fix hidden reels view and time axis not moving under zoom.

1 files changed, 8 insertions, 2 deletions

diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index 667bf5f87..480f6d690 100644
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -117,7 +117,7 @@ Timeline::paint_labels ()
 
 	int vsx, vsy;
 	_labels_canvas->GetViewStart (&vsx, &vsy);
-	gc->Translate (-vsx * _x_scroll_rate, -vsy * _y_scroll_rate);
+	gc->Translate (-vsx * _x_scroll_rate, -vsy * _y_scroll_rate + tracks_y_offset());
 
 	_labels_view->paint (gc, list<dcpomatic::Rect<int> >());
 
@@ -365,7 +365,7 @@ Timeline::assign_tracks ()
 	_labels_view->set_subtitle_tracks (subtitle_tracks);
 	_labels_view->set_atmos (have_atmos);
 
-	_time_axis_view->set_y (tracks() * track_height() + 64);
+	_time_axis_view->set_y (tracks());
 	_reels_view->set_y (8);
 }
 
@@ -745,3 +745,9 @@ Timeline::set_selection (ContentList selection)
 		}
 	}
 }
+
+int
+Timeline::tracks_y_offset () const
+{
+	return _reels_view->bbox().height + 4;
+}