diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 7ccce0d702..d71c265b42 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -247,9 +247,10 @@ Editor::Editor () : PublicEditor ("editor_window.xml") , _join_object_range_state (JOIN_OBJECT_RANGE_NONE) , timebar_height (xml_property (*xml_tree ()->root (), "timebar_height", 17.0)) - , ruler_height (xml_property (*xml_tree ()->root (), "ruler_height", 27.0)) + , ruler_height (xml_property (*xml_tree ()->root (), "ruler_height", 26.0)) , loopbar_height (xml_property (*xml_tree ()->root (), "loopbar_height", 26.0)) - , marker_height (xml_property (*xml_tree ()->root (), "marker_height", 17.0)) + , marker_height (xml_property (*xml_tree ()->root (), "marker_height", 18)) + , skipbar_height (xml_property (*xml_tree ()->root (), "skipbar_height", 17)) /* time display buttons */ , minsec_label (_("Mins:Secs")) , bbt_label (_("Bars:Beats")) diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index ec17714cb4..701852b56c 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -877,6 +877,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD const double ruler_height; const double loopbar_height; const double marker_height; + const double skipbar_height; Gtk::Menu *editor_ruler_menu; diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 3eb206bd8f..f3ac32af58 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -183,7 +183,7 @@ Editor::initialize_canvas () /* not outlined, so that there is no gap between it and the ruler in the same group */ punch_loop_bar->set_outline (false); - skip_bar = new ArdourCanvas::Rectangle (skip_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, marker_height)); + skip_bar = new ArdourCanvas::Rectangle (skip_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, skipbar_height)); CANVAS_DEBUG_NAME (skip_bar, "skip Bar"); skip_bar->set_outline_what (ArdourCanvas::Rectangle::BOTTOM); @@ -193,7 +193,7 @@ Editor::initialize_canvas () /* Rectangles displayed on the bars during drag operations */ - skip_drag_rect = new ArdourCanvas::Rectangle (skip_group, ArdourCanvas::Rect (0.0, 0.0, 100, marker_height)); + skip_drag_rect = new ArdourCanvas::Rectangle (skip_group, ArdourCanvas::Rect (0.0, 0.0, 100, skipbar_height)); CANVAS_DEBUG_NAME (skip_drag_rect, "skip drag"); skip_drag_rect->set_outline (false); skip_drag_rect->hide (); diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index 01eb7ce396..a202b1e185 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -127,7 +127,7 @@ Editor::add_new_location_internal (Location* location) } else if (location->is_skip ()) { /* skip: single marker that spans entire skip area */ - lam->start = new RangeMarker (location, *this, *skip_group, marker_height, 0, location->name(), location->start(), location->end()); + lam->start = new RangeMarker (location, *this, *skip_group, skipbar_height, 0, location->name(), location->start(), location->end()); lam->end = 0; group = skip_group; diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index 8a799a34f3..2d8cc60af5 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -140,6 +140,7 @@ Editor::initialize_rulers () clock_ruler = new ArdourCanvas::Ruler (ruler_group, *_minsec_metric, ArdourCanvas::Rect (0, loopbar_height, ArdourCanvas::COORD_MAX, loopbar_height + ruler_height)); clock_ruler->set_font_description (font); CANVAS_DEBUG_NAME (clock_ruler, "clock ruler"); + clock_ruler->set_outline (false); clock_ruler->raise_to_top (); ARDOUR_UI::instance()->primary_clock->mode_changed.connect (sigc::mem_fun (*this, &Editor::update_ruler_visibility)); @@ -408,7 +409,7 @@ Editor::update_ruler_visibility () } skip_playback_lane.show (); skip_group->show(); - pos += marker_height; // skip_bar->y1() - skip_bar->y0(); + pos += skipbar_height; // skip_bar->y1() - skip_bar->y0(); } else { skip_playback_lane.hide (); skip_group->hide(); diff --git a/gtk2_ardour/ui/editor_window.xml b/gtk2_ardour/ui/editor_window.xml index e54dce8c9f..4f9cd4b83d 100644 --- a/gtk2_ardour/ui/editor_window.xml +++ b/gtk2_ardour/ui/editor_window.xml @@ -1,9 +1,10 @@ + skipbar_height="17" + marker_height="18" >