From e706680e3d8517496944e04b7f0f6bd4746b939a Mon Sep 17 00:00:00 2001 From: Sampo Savolainen Date: Mon, 14 Aug 2006 19:19:06 +0000 Subject: [PATCH] Make bar lines on the canvas draw from top to bottom no matter how few tracks are visible. Make tracks toggle when ctrl-clicked git-svn-id: svn://localhost/ardour2/trunk@824 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/editor_tempodisplay.cc | 1 + gtk2_ardour/route_time_axis.cc | 3 +-- gtk2_ardour/selection.cc | 9 +++++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index 91710c5fc9..5e906cb617 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -194,6 +194,7 @@ Editor::draw_measures () double x1, x2, y1, y2; track_canvas.get_scroll_region (x1, y1, x2, y2); + y2 = 1000000000.0f; for (i = all_bbt_points->begin(); i != all_bbt_points->end(); ++i) { diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index 6e578a13e7..05f832700e 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -878,8 +878,7 @@ RouteTimeAxisView::selection_click (GdkEventButton* ev) switch (Keyboard::selection_type (ev->state)) { case Selection::Toggle: - /* XXX this is not right */ - editor.get_selection().add (*tracks); + editor.get_selection().toggle (*tracks); break; case Selection::Set: diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc index 086d878994..aa7fdbe30f 100644 --- a/gtk2_ardour/selection.cc +++ b/gtk2_ardour/selection.cc @@ -179,6 +179,14 @@ Selection::toggle (Playlist* pl) PlaylistsChanged (); } +void +Selection::toggle (const list& track_list) +{ + for (list::const_iterator i = track_list.begin(); i != track_list.end(); ++i) { + toggle ( (*i) ); + } +} + void Selection::toggle (TimeAxisView* track) { @@ -616,6 +624,7 @@ Selection::set (list& selectables) add (selectables); } + void Selection::add (list& selectables) {