diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 539209fd1e..0e3b663607 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -158,9 +158,9 @@ Editor::initialize_canvas () meter_group = new ArdourCanvas::Group (*time_canvas.root(), 0.0, 0.0); tempo_group = new ArdourCanvas::Group (*time_canvas.root(), 0.0, timebar_height); - marker_group = new ArdourCanvas::Group (*time_canvas.root(), 0.0, timebar_height * 2.0); - range_marker_group = new ArdourCanvas::Group (*time_canvas.root(), 0.0, timebar_height * 3.0); - transport_marker_group = new ArdourCanvas::Group (*time_canvas.root(), 0.0, timebar_height * 4.0); + range_marker_group = new ArdourCanvas::Group (*time_canvas.root(), 0.0, timebar_height * 2.0); + transport_marker_group = new ArdourCanvas::Group (*time_canvas.root(), 0.0, timebar_height * 3.0); + marker_group = new ArdourCanvas::Group (*time_canvas.root(), 0.0, timebar_height * 4.0); tempo_bar = new ArdourCanvas::SimpleRect (*tempo_group, 0.0, 0.0, max_canvas_coordinate, timebar_height-1.0); tempo_bar->property_outline_pixels() = 0; diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index 3cf2523b47..bb18ffd2ce 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -659,20 +659,6 @@ Editor::update_ruler_visibility () tempo_group->hide(); } - if (ruler_shown[ruler_time_marker]) { - lab_children.push_back (Element(mark_label, PACK_SHRINK, PACK_START)); - old_unit_pos = marker_group->property_y(); - if (tbpos != old_unit_pos) { - marker_group->move ( 0.0, tbpos - old_unit_pos); - } - marker_group->show(); - tbpos += timebar_height; - visible_timebars++; - } - else { - marker_group->hide(); - } - if (ruler_shown[ruler_time_range_marker]) { lab_children.push_back (Element(range_mark_label, PACK_SHRINK, PACK_START)); old_unit_pos = range_marker_group->property_y(); @@ -701,6 +687,20 @@ Editor::update_ruler_visibility () transport_marker_group->hide(); } + if (ruler_shown[ruler_time_marker]) { + lab_children.push_back (Element(mark_label, PACK_SHRINK, PACK_START)); + old_unit_pos = marker_group->property_y(); + if (tbpos != old_unit_pos) { + marker_group->move ( 0.0, tbpos - old_unit_pos); + } + marker_group->show(); + tbpos += timebar_height; + visible_timebars++; + } + else { + marker_group->hide(); + } + time_canvas_vbox.set_size_request (-1, (int)(timebar_height * visible_timebars)); time_canvas_event_box.queue_resize();