From daf51a2e49cee61f06eb632d5e2aaf7e18ebef56 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 10 Jan 2014 10:57:33 -0500 Subject: [PATCH] fix height issue with canvas-based rulers/bars, and use enums for outline specs --- gtk2_ardour/editor_canvas.cc | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 7449dd6086..df9cdcf824 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -107,35 +107,35 @@ Editor::initialize_canvas () CANVAS_DEBUG_NAME (_region_motion_group, "Canvas Region Motion"); meter_bar_group = new ArdourCanvas::Group (_time_bars_canvas->root ()); - meter_bar = new ArdourCanvas::Rectangle (meter_bar_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, timebar_height - 1)); + meter_bar = new ArdourCanvas::Rectangle (meter_bar_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, timebar_height)); CANVAS_DEBUG_NAME (meter_bar, "meter Bar"); - meter_bar->set_outline_what (0x8); + meter_bar->set_outline_what (ArdourCanvas::Rectangle::BOTTOM); tempo_bar_group = new ArdourCanvas::Group (_time_bars_canvas->root ()); - tempo_bar = new ArdourCanvas::Rectangle (tempo_bar_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, timebar_height - 1)); + tempo_bar = new ArdourCanvas::Rectangle (tempo_bar_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, timebar_height)); CANVAS_DEBUG_NAME (tempo_bar, "Tempo Bar"); - tempo_bar->set_outline_what (0x8); + tempo_bar->set_outline_what (ArdourCanvas::Rectangle::BOTTOM); range_marker_bar_group = new ArdourCanvas::Group (_time_bars_canvas->root ()); - range_marker_bar = new ArdourCanvas::Rectangle (range_marker_bar_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, timebar_height - 1)); + range_marker_bar = new ArdourCanvas::Rectangle (range_marker_bar_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, timebar_height)); CANVAS_DEBUG_NAME (range_marker_bar, "Range Marker Bar"); - range_marker_bar->set_outline_what (0x8); + range_marker_bar->set_outline_what (ArdourCanvas::Rectangle::BOTTOM); transport_marker_bar_group = new ArdourCanvas::Group (_time_bars_canvas->root ()); - transport_marker_bar = new ArdourCanvas::Rectangle (transport_marker_bar_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, timebar_height - 1)); + transport_marker_bar = new ArdourCanvas::Rectangle (transport_marker_bar_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, timebar_height)); CANVAS_DEBUG_NAME (transport_marker_bar, "transport Marker Bar"); - transport_marker_bar->set_outline_what (0x8); + transport_marker_bar->set_outline_what (ArdourCanvas::Rectangle::BOTTOM); marker_bar_group = new ArdourCanvas::Group (_time_bars_canvas->root ()); - marker_bar = new ArdourCanvas::Rectangle (marker_bar_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, timebar_height - 1)); + marker_bar = new ArdourCanvas::Rectangle (marker_bar_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, timebar_height)); CANVAS_DEBUG_NAME (marker_bar, "Marker Bar"); - marker_bar->set_outline_what (0x8); + marker_bar->set_outline_what (ArdourCanvas::Rectangle::BOTTOM); cd_marker_bar_group = new ArdourCanvas::Group (_time_bars_canvas->root ()); - cd_marker_bar = new ArdourCanvas::Rectangle (cd_marker_bar_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, timebar_height - 1)); + cd_marker_bar = new ArdourCanvas::Rectangle (cd_marker_bar_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, timebar_height)); CANVAS_DEBUG_NAME (cd_marker_bar, "CD Marker Bar"); - cd_marker_bar->set_outline_what (0x8); - + cd_marker_bar->set_outline_what (ArdourCanvas::Rectangle::BOTTOM); + _time_markers_group = new ArdourCanvas::Group (_time_bars_canvas->root()); meter_group = new ArdourCanvas::Group (_time_markers_group, ArdourCanvas::Duple (0.0, timebar_height * 5.0));