diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index a7cc8a6535..cf9de96f6d 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -250,6 +250,7 @@ Editor::Editor () , _join_object_range_state (JOIN_OBJECT_RANGE_NONE) , timebar_height (xml_property (*xml_tree ()->root (), "timebarheight", 17.0)) , ruler_height (xml_property (*xml_tree ()->root (), "rulerheight", 26.0)) + , ruler_divide_height (xml_property (*xml_tree ()->root (), "rulerdivideheight", 13.0)) , marker_height (xml_property (*xml_tree ()->root (), "markerheight", 18)) , skipbar_height (xml_property (*xml_tree ()->root (), "skipbarheight", 17)) /* time display buttons */ diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 274e464e6a..63d8d002c5 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -876,9 +876,10 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD const double timebar_height; const double ruler_height; + const double ruler_divide_height; const double marker_height; const double skipbar_height; - + Gtk::Menu *editor_ruler_menu; ArdourCanvas::Rectangle* tempo_bar; diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index ca9f4d1726..c5f352a706 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -200,8 +200,8 @@ Editor::initialize_canvas () range_bar_drag_rect->set_outline (false); range_bar_drag_rect->hide (); - /* drag bar for ruler is double height because it spans loop bar and the ruler */ - transport_bar_drag_rect = new ArdourCanvas::Rectangle (ruler_group, ArdourCanvas::Rect (0.0, 0.0, 100, ruler_height)); + transport_bar_drag_rect = new ArdourCanvas::Rectangle (ruler_group, ArdourCanvas::Rect (0.0, 0.0, 100, + ruler_height - ruler_divide_height)); CANVAS_DEBUG_NAME (transport_bar_drag_rect, "transport drag"); transport_bar_drag_rect->set_outline (false); transport_bar_drag_rect->hide (); diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index 27bccbe6db..9e9e0d0351 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -109,7 +109,7 @@ Editor::add_new_location_internal (Location* location) // no name shown ; actual marker is twice the height of the bar on which we drag, so that // it covers the ruler as well. - lam->start = new RulerMarker (location, *this, *ruler_group, ruler_height, ArdourCanvas::rgba_to_color (1.0, 1.0, 1.0, 0.4), + lam->start = new RulerMarker (location, *this, *ruler_group, ruler_height - ruler_divide_height, ArdourCanvas::rgba_to_color (1.0, 1.0, 1.0, 0.4), "", location->start(), location->end()); lam->end = 0; group = ruler_group;