Hacks to stop scrolling track names.

1 files changed, 5 insertions, 7 deletions

diff --git a/src/wx/timeline.h b/src/wx/timeline.h
index 375a837a8..3175d028c 100644
--- a/src/wx/timeline.h
+++ b/src/wx/timeline.h
@@ -35,7 +35,7 @@ class TimelineTimeAxisView;
 class TimelineReelsView;
 class TimelineLabelsView;
 
-class Timeline : public wxScrolledCanvas
+class Timeline : public wxPanel
 {
 public:
 	Timeline (wxWindow *, ContentPanel *, boost::shared_ptr<Film>);
@@ -56,10 +56,6 @@ public:
 		return _pixels_per_second;
 	}
 
-	Position<int> tracks_position () const {
-		return _tracks_position;
-	}
-
 	int tracks () const;
 
 	void set_snap (bool s) {
@@ -82,7 +78,8 @@ public:
 	}
 
 private:
-	void paint ();
+	void paint_labels ();
+	void paint_main ();
 	void left_down (wxMouseEvent &);
 	void left_down_select (wxMouseEvent &);
 	void left_up (wxMouseEvent &);
@@ -107,6 +104,8 @@ private:
 	ContentList selected_content () const;
 	void maybe_snap (DCPTime a, DCPTime b, boost::optional<DCPTime>& nearest_distance) const;
 
+	wxPanel* _labels_panel;
+	wxScrolledCanvas* _main_canvas;
 	ContentPanel* _content_panel;
 	boost::weak_ptr<Film> _film;
 	TimelineViewList _views;
@@ -125,7 +124,6 @@ private:
 	bool _snap;
 	std::list<DCPTime> _start_snaps;
 	std::list<DCPTime> _end_snaps;
-	Position<int> _tracks_position;
 	Tool _tool;
 	int _x_scroll_rate;
 	int _y_scroll_rate;