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

[dcpomatic.git] / src / wx / timeline.h

diff --git a/src/wx/timeline.h b/src/wx/timeline.h
index 3175d028c758cb9263c1c0aed105d88b4d096344..503025f3ce3e6f0006a237505db422ae9d386a33 100644 (file)
--- a/src/wx/timeline.h
+++ b/src/wx/timeline.h
@@ -49,7 +49,7 @@ public:
        }
 
        int track_height () const {
-               return 48;
+               return _track_height;
        }
 
        boost::optional<double> pixels_per_second () const {
@@ -77,6 +77,8 @@ public:
                _tool = t;
        }
 
+       int tracks_y_offset () const;
+
 private:
        void paint_labels ();
        void paint_main ();
@@ -104,7 +106,7 @@ private:
        ContentList selected_content () const;
        void maybe_snap (DCPTime a, DCPTime b, boost::optional<DCPTime>& nearest_distance) const;
 
-       wxPanel* _labels_panel;
+       wxScrolledCanvas* _labels_canvas;
        wxScrolledCanvas* _main_canvas;
        ContentPanel* _content_panel;
        boost::weak_ptr<Film> _film;
@@ -127,6 +129,7 @@ private:
        Tool _tool;
        int _x_scroll_rate;
        int _y_scroll_rate;
+       int _track_height;
 
        boost::signals2::scoped_connection _film_changed_connection;
        boost::signals2::scoped_connection _film_content_changed_connection;