summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorSampo Savolainen <v2@iki.fi>2006-08-14 19:19:06 +0000
committerSampo Savolainen <v2@iki.fi>2006-08-14 19:19:06 +0000
commite706680e3d8517496944e04b7f0f6bd4746b939a (patch)
treec9a3d6425e712f0a984bcfb1a9af489443494f1a /gtk2_ardour
parentb5c9a0cfc23974c75477ff451ef05359fef77f2c (diff)
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
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/editor_tempodisplay.cc1
-rw-r--r--gtk2_ardour/route_time_axis.cc3
-rw-r--r--gtk2_ardour/selection.cc9
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
@@ -180,6 +180,14 @@ Selection::toggle (Playlist* pl)
}
void
+Selection::toggle (const list<TimeAxisView*>& track_list)
+{
+ for (list<TimeAxisView*>::const_iterator i = track_list.begin(); i != track_list.end(); ++i) {
+ toggle ( (*i) );
+ }
+}
+
+void
Selection::toggle (TimeAxisView* track)
{
TrackSelection::iterator i;
@@ -616,6 +624,7 @@ Selection::set (list<Selectable*>& selectables)
add (selectables);
}
+
void
Selection::add (list<Selectable*>& selectables)
{