summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gtk2_ardour/automation_time_axis.cc2
-rw-r--r--gtk2_ardour/streamview.cc8
-rw-r--r--gtk2_ardour/time_axis_view.cc4
3 files changed, 7 insertions, 7 deletions
diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index 5f8845bb19..75daefa6a7 100644
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -120,7 +120,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (
CANVAS_DEBUG_NAME (_base_rect, string_compose ("base rect for %1", _name));
_base_rect->set_x1 (ArdourCanvas::COORD_MAX);
_base_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_AutomationTrackOutline());
- _base_rect->set_outline_what (ArdourCanvas::Rectangle::What (0));
+ _base_rect->set_outline_what (ArdourCanvas::Rectangle::BOTTOM); // bottom separator
_base_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_AutomationTrackFill());
_base_rect->set_data ("trackview", this);
_base_rect->Event.connect (sigc::bind (sigc::mem_fun (_editor, &PublicEditor::canvas_automation_track_event), _base_rect, this));
diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc
index b133179390..5d2b58a5cd 100644
--- a/gtk2_ardour/streamview.cc
+++ b/gtk2_ardour/streamview.cc
@@ -71,8 +71,8 @@ StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Container* canvas_g
canvas_rect = new ArdourCanvas::Rectangle (_canvas_group);
CANVAS_DEBUG_NAME (canvas_rect, string_compose ("SV canvas rectangle %1", _trackview.name()));
- canvas_rect->set (ArdourCanvas::Rect (0, 0, ArdourCanvas::COORD_MAX, tv.current_height ()));
- canvas_rect->set_outline_what (ArdourCanvas::Rectangle::What (0));
+ canvas_rect->set (ArdourCanvas::Rect (0, 0, ArdourCanvas::COORD_MAX, tv.current_height () -1));
+ canvas_rect->set_outline_what (ArdourCanvas::Rectangle::BOTTOM); // bottom separator
canvas_rect->set_outline_color (RGBA_TO_UINT (0, 0, 0, 255));
canvas_rect->set_fill (true);
canvas_rect->Event.connect (sigc::bind (sigc::mem_fun (_trackview.editor(), &PublicEditor::canvas_stream_view_event), canvas_rect, &_trackview));
@@ -119,12 +119,12 @@ StreamView::set_height (double h)
return -1;
}
- if (canvas_rect->y1() == h) {
+ if (canvas_rect->y1() == h /* -1 */) {
return 0;
}
height = h;
- canvas_rect->set_y1 (height);
+ canvas_rect->set_y1 (height /* -1 */); // share the separator with outline
update_contents_height ();
return 0;
diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index b2a815be5f..1e0b95d5a1 100644
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -291,7 +291,7 @@ TimeAxisView::show_at (double y, int& nth, VBox *parent)
if (_y_position != y) {
_canvas_separator->set (ArdourCanvas::Duple(0, y), ArdourCanvas::Duple(ArdourCanvas::COORD_MAX, y));
- _canvas_display->set_y_position (y + 1); // XXX
+ _canvas_display->set_y_position (y + 1);
_y_position = y;
}
@@ -892,7 +892,7 @@ TimeAxisView::show_selection (TimeSelection& ts)
x1 = _editor.sample_to_pixel (start);
x2 = _editor.sample_to_pixel (start + cnt - 1);
- y2 = current_height();
+ y2 = current_height() - 1;
rect->rect->set (ArdourCanvas::Rect (x1, 0, x2, y2));