diff options
| author | David Robillard <d@drobilla.net> | 2008-09-14 21:15:08 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-09-14 21:15:08 +0000 |
| commit | 92b249074a5156419f7a28071077f2bfc89a680e (patch) | |
| tree | a71fc92d4897f5ba5c1c44da816297c857af477c /gtk2_ardour | |
| parent | 3bcc2896b6206d9078faf7005bdf0538c6d97528 (diff) | |
Show tempo lines above marker bars.
git-svn-id: svn://localhost/ardour2/branches/3.0@3729 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/editor.h | 1 | ||||
| -rw-r--r-- | gtk2_ardour/editor_canvas.cc | 16 |
2 files changed, 10 insertions, 7 deletions
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index eb03922eaf..2f6576827f 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -636,6 +636,7 @@ class Editor : public PublicEditor ArdourCanvas::Group* timebar_group; /* These bars never need to be scrolled */ + ArdourCanvas::Group* _bar_group; ArdourCanvas::Group* meter_bar_group; ArdourCanvas::Group* tempo_bar_group; ArdourCanvas::Group* marker_bar_group; diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 47119a7b7f..46fb9b1865 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -163,38 +163,38 @@ Editor::initialize_canvas () } _master_group = new ArdourCanvas::Group (*track_canvas->root()); - + _bar_group = new ArdourCanvas::Group (*track_canvas->root()); _trackview_group = new ArdourCanvas::Group (*_master_group); _region_motion_group = new ArdourCanvas::Group (*_master_group); /* el barrio */ - meter_bar_group = new ArdourCanvas::Group (*track_canvas->root()); + meter_bar_group = new ArdourCanvas::Group (*_bar_group); meter_bar = new ArdourCanvas::SimpleRect (*meter_bar_group, 0.0, 0.0, max_canvas_coordinate, timebar_height-1.0); meter_bar->property_outline_what() = (0x1 | 0x8); meter_bar->property_outline_pixels() = 1; - tempo_bar_group = new ArdourCanvas::Group (*track_canvas->root()); + tempo_bar_group = new ArdourCanvas::Group (*_bar_group); tempo_bar = new ArdourCanvas::SimpleRect (*tempo_bar_group, 0.0, 0.0, max_canvas_coordinate, (timebar_height-1.0)); tempo_bar->property_outline_what() = (0x1 | 0x8); tempo_bar->property_outline_pixels() = 1; - range_marker_bar_group = new ArdourCanvas::Group (*track_canvas->root()); + range_marker_bar_group = new ArdourCanvas::Group (*_bar_group); range_marker_bar = new ArdourCanvas::SimpleRect (*range_marker_bar_group, 0.0, 0.0, max_canvas_coordinate, (timebar_height-1.0)); range_marker_bar->property_outline_what() = (0x1 | 0x8); range_marker_bar->property_outline_pixels() = 1; - transport_marker_bar_group = new ArdourCanvas::Group (*track_canvas->root()); + transport_marker_bar_group = new ArdourCanvas::Group (*_bar_group); transport_marker_bar = new ArdourCanvas::SimpleRect (*transport_marker_bar_group, 0.0, 0.0, max_canvas_coordinate, (timebar_height-1.0)); transport_marker_bar->property_outline_what() = (0x1 | 0x8); transport_marker_bar->property_outline_pixels() = 1; - marker_bar_group = new ArdourCanvas::Group (*track_canvas->root()); + marker_bar_group = new ArdourCanvas::Group (*_bar_group); marker_bar = new ArdourCanvas::SimpleRect (*marker_bar_group, 0.0, 0.0, max_canvas_coordinate, (timebar_height-1.0)); marker_bar->property_outline_what() = (0x1 | 0x8); marker_bar->property_outline_pixels() = 1; - cd_marker_bar_group = new ArdourCanvas::Group (*track_canvas->root()); + cd_marker_bar_group = new ArdourCanvas::Group (*_bar_group); cd_marker_bar = new ArdourCanvas::SimpleRect (*cd_marker_bar_group, 0.0, 0.0, max_canvas_coordinate, (timebar_height-1.0)); cd_marker_bar->property_outline_what() = (0x1 | 0x8); cd_marker_bar->property_outline_pixels() = 1; @@ -245,6 +245,8 @@ Editor::initialize_canvas () transport_punch_range_rect->hide(); transport_loop_range_rect->lower_to_bottom (); // loop on the bottom + + _bar_group->lower_to_bottom(); // below tempo lines transport_punchin_line = new ArdourCanvas::SimpleLine (*_master_group); transport_punchin_line->property_x1() = 0.0; |