13
0

fix height issue with canvas-based rulers/bars, and use enums for outline specs

This commit is contained in:
Paul Davis 2014-01-10 10:57:33 -05:00
parent 7e075abb6c
commit daf51a2e49

View File

@ -107,35 +107,35 @@ Editor::initialize_canvas ()
CANVAS_DEBUG_NAME (_region_motion_group, "Canvas Region Motion"); CANVAS_DEBUG_NAME (_region_motion_group, "Canvas Region Motion");
meter_bar_group = new ArdourCanvas::Group (_time_bars_canvas->root ()); 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"); 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_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"); 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_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"); 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_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"); 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_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"); 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_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"); 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()); _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)); meter_group = new ArdourCanvas::Group (_time_markers_group, ArdourCanvas::Duple (0.0, timebar_height * 5.0));