From: Carl Hetherington <cth@carlh.net>
Date: Mon, 2 Jul 2018 21:55:29 +0000 (+0100)
Subject: Fix drawing.
X-Git-Tag: v2.13.33~27
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=f9d707e3fa3927a555b7cfd99fa2b48d7cb3f45e;hp=220518a7bf41bfd9e9da852b4d5ac1461fdd0e1a;p=dcpomatic.git

Fix drawing.
---

diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index 2e4de2274..30a5ef172 100644
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -79,6 +79,7 @@ Timeline::Timeline (wxWindow* parent, ContentPanel* cp, shared_ptr<Film> film)
 
 	wxSizer* sizer = new wxBoxSizer (wxHORIZONTAL);
 	sizer->Add (_labels_panel, 0, wxEXPAND);
+	_labels_panel->SetMinSize (wxSize (_labels_view->bbox().width, -1));
 	sizer->Add (_main_canvas, 1, wxEXPAND);
 	SetSizer (sizer);
 
@@ -106,7 +107,7 @@ Timeline::Timeline (wxWindow* parent, ContentPanel* cp, shared_ptr<Film> film)
 void
 Timeline::paint_labels ()
 {
-	wxPaintDC dc (this);
+	wxPaintDC dc (_labels_panel);
 
 	wxGraphicsContext* gc = wxGraphicsContext::Create (dc);
 	if (!gc) {
@@ -121,7 +122,7 @@ Timeline::paint_labels ()
 void
 Timeline::paint_main ()
 {
-	wxPaintDC dc (this);
+	wxPaintDC dc (_main_canvas);
 	_main_canvas->DoPrepareDC (dc);
 
 	wxGraphicsContext* gc = wxGraphicsContext::Create (dc);
diff --git a/src/wx/timeline_content_view.cc b/src/wx/timeline_content_view.cc
index eacfbfd4a..abb671b77 100644
--- a/src/wx/timeline_content_view.cc
+++ b/src/wx/timeline_content_view.cc
@@ -117,11 +117,11 @@ TimelineContentView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int>
 
 	/* Outline */
 	wxGraphicsPath path = gc->CreatePath ();
-	path.MoveToPoint    (time_x (position) + 1,	      y_pos (_track.get()) + 4);
+	path.MoveToPoint    (time_x (position) + 2,	      y_pos (_track.get()) + 4);
 	path.AddLineToPoint (time_x (position + len) - 1,     y_pos (_track.get()) + 4);
 	path.AddLineToPoint (time_x (position + len) - 1,     y_pos (_track.get() + 1) - 4);
-	path.AddLineToPoint (time_x (position) + 1,	      y_pos (_track.get() + 1) - 4);
-	path.AddLineToPoint (time_x (position) + 1,	      y_pos (_track.get()) + 4);
+	path.AddLineToPoint (time_x (position) + 2,	      y_pos (_track.get() + 1) - 4);
+	path.AddLineToPoint (time_x (position) + 2,	      y_pos (_track.get()) + 4);
 	gc->StrokePath (path);
 	gc->FillPath (path);