From 6685f9c6b71486619515038c21733a173c271f5f Mon Sep 17 00:00:00 2001 From: Nick Mainsbridge Date: Sun, 14 Sep 2008 11:24:23 +0000 Subject: [PATCH] Put timeline_group in the correct layer to begin with, fix missing header on new tracks caused by last commit (sorry about that). git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3723 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/editor_canvas.cc | 8 +++----- gtk2_ardour/editor_tempodisplay.cc | 4 ---- gtk2_ardour/time_axis_view.cc | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 969970365a..9493c51547 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -154,6 +154,9 @@ Editor::initialize_canvas () _master_group = new ArdourCanvas::Group (*track_canvas->root()); + /* a group to hold time (measure) lines */ + time_line_group = new ArdourCanvas::Group (*_master_group, 0.0, 0.0); + _trackview_group = new ArdourCanvas::Group (*_master_group); _region_motion_group = new ArdourCanvas::Group (*_master_group); @@ -187,11 +190,6 @@ Editor::initialize_canvas () cd_marker_bar->property_outline_what() = (0x1 | 0x8); cd_marker_bar->property_outline_pixels() = 0; - - /* a group to hold time (measure) lines */ - - time_line_group = new ArdourCanvas::Group (*_master_group, 0.0, 0.0); - range_marker_drag_rect = new ArdourCanvas::SimpleRect (*time_line_group, 0.0, 0.0, 0.0, 0.0); //range_marker_drag_rect = new ArdourCanvas::SimpleRect (*_master_group, 0.0, 0.0, 0.0, 0.0); range_marker_drag_rect->hide (); diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index 1fe680fb04..16fe3b8464 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -269,10 +269,6 @@ Editor::draw_measures () } } - /* the cursors are always on top of everything */ - - //cursor_group->raise_to_top(); - time_line_group->lower_to_bottom(); if (logo_item) { logo_item->lower_to_bottom (); } diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index 4bf18a5ae5..6832227822 100644 --- a/gtk2_ardour/time_axis_view.cc +++ b/gtk2_ardour/time_axis_view.cc @@ -243,7 +243,7 @@ TimeAxisView::show_at (double y, int& nth, VBox *parent) canvas_display->raise_to_top (); - if (_marked_for_display && _hidden) { + if (_marked_for_display) { canvas_display->show(); controls_frame.show (); controls_ebox.show (); -- 2.30.2