Put timeline_group in the correct layer to begin with, fix missing header on new...

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3723 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index 969970365a7041d1db109bee9b5b8623d638b4d1..9493c51547e4ea596ef44e642a070ff5d8cf1de1 100644 (file)
--- 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 1fe680fb04c0d81a3a790b8de4e50c61f1089ebd..16fe3b8464a2ce43be83853ffa099f8482a4a949 100644 (file)
--- 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 4bf18a5ae54b6b1cb7cb1ab9c0c111cfa043ec77..68322278226099ef5481fc0d79ead8fc789831a1 100644 (file)
--- 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 ();