diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-10-19 22:30:55 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-10-19 22:30:55 +0100 |
| commit | 7bc94f069f011a1a7e8554aa5cc88167e409c1f8 (patch) | |
| tree | eb3c8a25c3d51e51a82807c05128fb3608deef47 /src/wx/timeline.cc | |
| parent | b5362c8fe1244506e05d18c93026150886171b8f (diff) | |
Draw reels in the timeline.
Diffstat (limited to 'src/wx/timeline.cc')
| -rw-r--r-- | src/wx/timeline.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index f91d2937f..e2cc1a249 100644 --- a/src/wx/timeline.cc +++ b/src/wx/timeline.cc @@ -20,6 +20,7 @@ #include "film_editor.h" #include "timeline.h" #include "timeline_time_axis_view.h" +#include "timeline_reels_view.h" #include "timeline_video_content_view.h" #include "timeline_audio_content_view.h" #include "timeline_subtitle_content_view.h" @@ -49,7 +50,8 @@ Timeline::Timeline (wxWindow* parent, ContentPanel* cp, shared_ptr<Film> film) : wxPanel (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE) , _content_panel (cp) , _film (film) - , _time_axis_view (new TimelineTimeAxisView (*this, 32)) + , _time_axis_view (new TimelineTimeAxisView (*this, 64)) + , _reels_view (new TimelineReelsView (*this, 32)) , _tracks (0) , _left_down (false) , _down_view_position (0) @@ -112,6 +114,7 @@ Timeline::recreate_views () _views.clear (); _views.push_back (_time_axis_view); + _views.push_back (_reels_view); BOOST_FOREACH (shared_ptr<Content> i, film->content ()) { if (dynamic_pointer_cast<VideoContent> (i)) { @@ -203,7 +206,8 @@ Timeline::assign_tracks () _tracks = max (_tracks, t + 1); } - _time_axis_view->set_y (tracks() * track_height() + 32); + _time_axis_view->set_y (tracks() * track_height() + 64); + _reels_view->set_y (tracks() * track_height() + 32); } int |