X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline_labels_view.cc;h=181adc5ca411b07a8ada58617309e62782768010;hb=HEAD;hp=ee1b1948996e3120571873f397cc9b6bdae0e0bc;hpb=58e851f428a035841acf0196348a0643230ed808;p=dcpomatic.git

diff --git a/src/wx/timeline_labels_view.cc b/src/wx/timeline_labels_view.cc
index ee1b19489..181adc5ca 100644
--- a/src/wx/timeline_labels_view.cc
+++ b/src/wx/timeline_labels_view.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -19,84 +19,102 @@
 */
 
 
-#include "timeline_labels_view.h"
 #include "timeline.h"
-#include <wx/wx.h>
+#include "timeline_labels_view.h"
+#include "wx_util.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/graphics.h>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
+
 
 using std::list;
-using std::min;
 using std::max;
+using std::min;
+
 
 TimelineLabelsView::TimelineLabelsView (Timeline& tl)
 	: TimelineView (tl)
-	, _threed (true)
-	, _subtitle_tracks (0)
-	, _atmos (true)
 {
 	wxString labels[] = {
 		_("Video"),
 		_("Audio"),
-		_("Subtitles"),
+		_("Subtitles/captions"),
 		_("Atmos")
 	};
 
-	_width = 0;
-
         wxClientDC dc (&_timeline);
 	for (int i = 0; i < 3; ++i) {
-		wxSize size = dc.GetTextExtent (labels[i]);
+		auto size = dc.GetTextExtent (labels[i]);
 		_width = max (_width, size.GetWidth());
 	}
 
-	_width += 16;
+	_width += 24;
 }
 
+
 dcpomatic::Rect<int>
 TimelineLabelsView::bbox () const
 {
-	return dcpomatic::Rect<int> (0, 0, _width, _timeline.tracks() * _timeline.track_height());
+	return dcpomatic::Rect<int> (0, 0, _width, _timeline.tracks() * _timeline.pixels_per_track());
 }
 
+
 void
-TimelineLabelsView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int> >)
+TimelineLabelsView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int>>)
 {
-	int const h = _timeline.track_height ();
-	gc->SetFont (gc->CreateFont(wxNORMAL_FONT->Bold(), wxColour (0, 0, 0)));
+	int const h = _timeline.pixels_per_track ();
+	wxColour const colour = gui_is_dark() ? *wxWHITE : *wxBLACK;
+	gc->SetFont(gc->CreateFont(wxNORMAL_FONT->Bold(), colour));
 
 	int fy = 0;
-	int ty = _threed ? 2 * h : h;
-	gc->DrawText (_("Video"), 0, _timeline.tracks_position().y + (ty + fy) / 2 - 8);
-	fy = ty;
+	if (_video_tracks) {
+		int ty = fy + _video_tracks * h;
+		gc->DrawText (_("Video"), 0, (ty + fy) / 2 - 8);
+		fy = ty;
+	}
 
-	if (_subtitle_tracks) {
-		ty = fy + _subtitle_tracks * h;
-		gc->DrawText (_("Subtitles"), 0, _timeline.tracks_position().y + (ty + fy) / 2 - 8);
+	if (_text_tracks) {
+		int ty = fy + _text_tracks * h;
+		gc->DrawText (_("Subtitles/captions"), 0, (ty + fy) / 2 - 8);
 		fy = ty;
 	}
 
 	if (_atmos) {
-		ty = fy + h;
-		gc->DrawText (_("Atmos"), 0, _timeline.tracks_position().y + (ty + fy) / 2 - 8);
+		int ty = fy + h;
+		gc->DrawText (_("Atmos"), 0, (ty + fy) / 2 - 8);
 		fy = ty;
 	}
 
-	ty = _timeline.tracks() * h;
-	gc->DrawText (_("Audio"), 0, _timeline.tracks_position().y + (ty + fy) / 2 - 8);
+	if (_audio_tracks) {
+		int ty = _timeline.tracks() * h;
+		gc->DrawText (_("Audio"), 0, (ty + fy) / 2 - 8);
+	}
 }
 
+
 void
-TimelineLabelsView::set_3d (bool s)
+TimelineLabelsView::set_video_tracks (int n)
 {
-	_threed = s;
+	_video_tracks = n;
 }
 
+
 void
-TimelineLabelsView::set_subtitle_tracks (int n)
+TimelineLabelsView::set_audio_tracks (int n)
 {
-	_subtitle_tracks = n;
+	_audio_tracks = n;
 }
 
+
+void
+TimelineLabelsView::set_text_tracks (int n)
+{
+	_text_tracks = n;
+}
+
+
 void
 TimelineLabelsView::set_atmos (bool s)
 {