Fix rebase onto master.

[dcpomatic.git] / src / wx / timeline_labels_view.cc

diff --git a/src/wx/timeline_labels_view.cc b/src/wx/timeline_labels_view.cc
index e5827f9c9cbfa896054d25e8de688a6f599fde01..3a809bfffca3a991582f7cc89fcd03a18a7983b5 100644 (file)
--- a/src/wx/timeline_labels_view.cc
+++ b/src/wx/timeline_labels_view.cc
@@ -24,6 +24,7 @@
 #include <wx/graphics.h>
 
 using std::list;
+using std::min;
 using std::max;
 
 TimelineLabelsView::TimelineLabelsView (Timeline& tl)
@@ -56,8 +57,8 @@ void
 TimelineLabelsView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int> >)
 {
        int const h = _timeline.track_height ();
-       gc->SetFont (gc->CreateFont(*wxNORMAL_FONT, wxColour (0, 0, 0)));
-       gc->DrawText (_("Video"), 0, h / 2);
-       gc->DrawText (_("Subtitles"), 0, 3 * h / 2);
-       gc->DrawText (_("Audio"), 0, h + _timeline.tracks() * h / 2);
+       gc->SetFont (gc->CreateFont(wxNORMAL_FONT->Bold(), wxColour (0, 0, 0)));
+       gc->DrawText (_("Video"),     0, _timeline.tracks_position().y + h - 8);
+       gc->DrawText (_("Subtitles"), 0, _timeline.tracks_position().y + 5 * h / 2 - 8);
+       gc->DrawText (_("Audio"),     0, _timeline.tracks_position().y + (3 + max (_timeline.tracks(), 3)) * h / 2 - 8);
 }