diff --git a/gtk2_ardour/ardour3_ui_default.conf b/gtk2_ardour/ardour3_ui_default.conf
index 5029c3f121..c9ce81cfde 100644
--- a/gtk2_ardour/ardour3_ui_default.conf
+++ b/gtk2_ardour/ardour3_ui_default.conf
@@ -7,7 +7,7 @@
-
+
@@ -42,13 +42,13 @@
-
+
-
+
@@ -80,7 +80,7 @@
-
+
@@ -91,14 +91,14 @@
-
+
-
+
diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc
index 60f52d50a3..e855065631 100644
--- a/gtk2_ardour/audio_region_view.cc
+++ b/gtk2_ardour/audio_region_view.cc
@@ -951,7 +951,7 @@ AudioRegionView::create_one_wave (uint32_t which, bool direct)
/* all waves created, don't hook into peaks ready anymore */
data_ready_connection.disconnect ();
- if(0)
+#if 0
if (!zero_line) {
zero_line = new ArdourCanvas::SimpleLine (*group);
zero_line->property_x1() = (gdouble) 1.0;
@@ -959,6 +959,7 @@ AudioRegionView::create_one_wave (uint32_t which, bool direct)
zero_line->property_color_rgba() = (guint) ARDOUR_UI::config()->canvasvar_ZeroLine.get();
manage_zero_line ();
}
+#endif
}
}
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 2f6576827f..b957c995a0 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -636,7 +636,6 @@ 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;
@@ -644,22 +643,16 @@ class Editor : public PublicEditor
ArdourCanvas::Group* transport_marker_bar_group;
ArdourCanvas::Group* cd_marker_bar_group;
- /*
- The _master_group is the group containing all items
- that require horizontal scrolling..
- It is primarily used to separate canvas items
- that require horizontal scrolling from those that do not.
- */
+ /** The group containing all items that require horizontal scrolling. */
ArdourCanvas::Group* _master_group;
- /*
- The _trackview_group is the group containing all trackviews.
- It is only scrolled vertically.
- */
+
+ /** The group containiner marker bars */
+ ArdourCanvas::Group* _bar_group;
+
+ /* The group containing all trackviews. Only scrolled vertically. */
ArdourCanvas::Group* _trackview_group;
- /*
- This canvas group is used for region motion.
- It sits on top of the _trackview_group
- */
+
+ /* The group used for region motion. Sits on top of _trackview_group */
ArdourCanvas::Group* _region_motion_group;
enum RulerType {
diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index 46fb9b1865..51093f3bcf 100644
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -95,6 +95,7 @@ static void ardour_canvas_type_init()
#endif
}
+
void
Editor::initialize_canvas ()
{
@@ -163,7 +164,7 @@ Editor::initialize_canvas ()
}
_master_group = new ArdourCanvas::Group (*track_canvas->root());
- _bar_group = new ArdourCanvas::Group (*track_canvas->root());
+ _bar_group = new ArdourCanvas::Group (*_master_group);
_trackview_group = new ArdourCanvas::Group (*_master_group);
_region_motion_group = new ArdourCanvas::Group (*_master_group);
@@ -201,13 +202,13 @@ Editor::initialize_canvas ()
/* a group to hold time (measure) lines */
- time_line_group = new ArdourCanvas::Group (*_master_group, 0.0, 0.0);
+ 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 ();
- timebar_group = new ArdourCanvas::Group (*track_canvas->root());
+ timebar_group = new ArdourCanvas::Group (*_master_group);
cursor_group = new ArdourCanvas::Group (*track_canvas->root(), 0.0, 0.0);
meter_group = new ArdourCanvas::Group (*timebar_group, 0.0, timebar_height * 5.0);
@@ -246,7 +247,11 @@ Editor::initialize_canvas ()
transport_loop_range_rect->lower_to_bottom (); // loop on the bottom
- _bar_group->lower_to_bottom(); // below tempo lines
+ time_line_group->lower_to_bottom();
+ _trackview_group->raise_to_top();
+ _bar_group->raise_to_top();
+ timebar_group->raise_to_top();
+ timebar_group->raise(1);
transport_punchin_line = new ArdourCanvas::SimpleLine (*_master_group);
transport_punchin_line->property_x1() = 0.0;
@@ -255,7 +260,7 @@ Editor::initialize_canvas ()
transport_punchin_line->property_y2() = 0.0;
transport_punchin_line->hide ();
- transport_punchout_line = new ArdourCanvas::SimpleLine (*_master_group);
+ transport_punchout_line = new ArdourCanvas::SimpleLine (*_master_group);
transport_punchout_line->property_x1() = 0.0;
transport_punchout_line->property_y1() = 0.0;
transport_punchout_line->property_x2() = 0.0;
diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc
index 95838c5cef..5623394d94 100644
--- a/gtk2_ardour/streamview.cc
+++ b/gtk2_ardour/streamview.cc
@@ -67,6 +67,7 @@ StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Group* group)
canvas_rect->property_y1() = 0.0;
canvas_rect->property_x2() = _trackview.editor.frame_to_pixel (max_frames - 1);
canvas_rect->property_y2() = (double) tv.current_height();
+ canvas_rect->raise(1); // raise above tempo lines
// DR-way
canvas_rect->property_outline_what() = (guint32) (0x2|0x8); // outline RHS and bottom