diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-05-21 11:12:57 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-03 16:10:27 -0400 |
| commit | 5696199daffbd40e82aa7f0a754e36b2adf6726e (patch) | |
| tree | 74893088872a75e4d0120bfe2d57b0a155426ee4 /gtk2_ardour/editor_canvas.cc | |
| parent | c9f890bd7c3377d86030e98f002d85acd66f0997 (diff) | |
remove timebar canvas and just use a single canvas instead. This is just part one - lots of minor fixes to be done
Diffstat (limited to 'gtk2_ardour/editor_canvas.cc')
| -rw-r--r-- | gtk2_ardour/editor_canvas.cc | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index eaf9c25598..a7c884ac98 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -114,40 +114,43 @@ Editor::initialize_canvas () /* TIME BAR CANVAS */ - _time_bars_canvas_viewport = new ArdourCanvas::GtkCanvasViewport (horizontal_adjustment, unused_adjustment); - _time_bars_canvas = _time_bars_canvas_viewport->canvas (); + ArdourCanvas::ScrollGroup* hg; - meter_bar_group = new ArdourCanvas::Group (_time_bars_canvas->root ()); + h_scroll_group = hg = new ArdourCanvas::ScrollGroup (_track_canvas->root(), ArdourCanvas::ScrollGroup::ScrollsHorizontally); + CANVAS_DEBUG_NAME (h_scroll_group, "canvas h scroll"); + _track_canvas->add_scroller (*hg); + + meter_bar_group = new ArdourCanvas::Group (h_scroll_group); meter_bar = new ArdourCanvas::Rectangle (meter_bar_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, timebar_height)); CANVAS_DEBUG_NAME (meter_bar, "meter Bar"); meter_bar->set_outline_what (ArdourCanvas::Rectangle::BOTTOM); - tempo_bar_group = new ArdourCanvas::Group (_time_bars_canvas->root ()); + tempo_bar_group = new ArdourCanvas::Group (h_scroll_group); tempo_bar = new ArdourCanvas::Rectangle (tempo_bar_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, timebar_height)); CANVAS_DEBUG_NAME (tempo_bar, "Tempo Bar"); tempo_bar->set_outline_what (ArdourCanvas::Rectangle::BOTTOM); - range_marker_bar_group = new ArdourCanvas::Group (_time_bars_canvas->root ()); + range_marker_bar_group = new ArdourCanvas::Group (h_scroll_group); range_marker_bar = new ArdourCanvas::Rectangle (range_marker_bar_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, timebar_height)); CANVAS_DEBUG_NAME (range_marker_bar, "Range Marker Bar"); range_marker_bar->set_outline_what (ArdourCanvas::Rectangle::BOTTOM); - transport_marker_bar_group = new ArdourCanvas::Group (_time_bars_canvas->root ()); + transport_marker_bar_group = new ArdourCanvas::Group (h_scroll_group); transport_marker_bar = new ArdourCanvas::Rectangle (transport_marker_bar_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, timebar_height)); CANVAS_DEBUG_NAME (transport_marker_bar, "transport Marker Bar"); transport_marker_bar->set_outline_what (ArdourCanvas::Rectangle::BOTTOM); - marker_bar_group = new ArdourCanvas::Group (_time_bars_canvas->root ()); + marker_bar_group = new ArdourCanvas::Group (h_scroll_group); marker_bar = new ArdourCanvas::Rectangle (marker_bar_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, timebar_height)); CANVAS_DEBUG_NAME (marker_bar, "Marker Bar"); marker_bar->set_outline_what (ArdourCanvas::Rectangle::BOTTOM); - cd_marker_bar_group = new ArdourCanvas::Group (_time_bars_canvas->root ()); + cd_marker_bar_group = new ArdourCanvas::Group (h_scroll_group); cd_marker_bar = new ArdourCanvas::Rectangle (cd_marker_bar_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, timebar_height)); CANVAS_DEBUG_NAME (cd_marker_bar, "CD Marker Bar"); cd_marker_bar->set_outline_what (ArdourCanvas::Rectangle::BOTTOM); - _time_markers_group = new ArdourCanvas::Group (_time_bars_canvas->root()); + _time_markers_group = new ArdourCanvas::Group (h_scroll_group); cd_marker_group = new ArdourCanvas::Group (_time_markers_group, ArdourCanvas::Duple (0.0, 0.0)); CANVAS_DEBUG_NAME (cd_marker_group, "cd marker group"); @@ -929,7 +932,7 @@ Editor::clamp_verbose_cursor_y (double y) ArdourCanvas::Group* Editor::get_time_bars_group () const { - return _time_bars_canvas->root(); + return h_scroll_group; } ArdourCanvas::Group* @@ -939,12 +942,6 @@ Editor::get_track_canvas_group() const } ArdourCanvas::GtkCanvasViewport* -Editor::get_time_bars_canvas() const -{ - return _time_bars_canvas_viewport; -} - -ArdourCanvas::GtkCanvasViewport* Editor::get_track_canvas() const { return _track_canvas_viewport; |