X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view.cc;h=a5d91c7bc269f8cd9577a4e3286feb69f5f598d1;hb=fe9f2b15b13ce1e8216305f4c3916582ab65f8df;hp=3478297e580ba2b1d1a54bf66abc97d0516d9caf;hpb=0796ccfb652dd31ea1d94526e0e6d92863a972b0;p=ardour.git

diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index 3478297e58..a5d91c7bc2 100644
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -58,6 +58,7 @@ using namespace std;
 using namespace Gtk;
 using namespace Gdk;
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 using namespace PBD;
 using namespace Editing;
 using namespace ArdourCanvas;
@@ -97,16 +98,16 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie
 		compute_heights ();
 	}
 
-	_canvas_display = new ArdourCanvas::Layout (ed.get_trackview_group (), ArdourCanvas::Duple (0.0, 0.0));
+	_canvas_display = new ArdourCanvas::Container (ed.get_trackview_group (), ArdourCanvas::Duple (0.0, 0.0));
 	CANVAS_DEBUG_NAME (_canvas_display, "main for TAV");
 	_canvas_display->hide(); // reveal as needed
 
-	selection_group = new ArdourCanvas::Layout (_canvas_display);
+	selection_group = new ArdourCanvas::Container (_canvas_display);
 	CANVAS_DEBUG_NAME (selection_group, "selection for TAV");
 	selection_group->set_data (X_("timeselection"), (void *) 1);
 	selection_group->hide();
 	
-	_ghost_group = new ArdourCanvas::Layout (_canvas_display);
+	_ghost_group = new ArdourCanvas::Container (_canvas_display);
 	CANVAS_DEBUG_NAME (_ghost_group, "ghost for TAV");
 	_ghost_group->lower_to_bottom();
 	_ghost_group->show();
@@ -674,7 +675,7 @@ TimeAxisView::end_name_edit (int response)
 		}
 
 		if ((i != allviews.end()) && (*i != this) && !(*i)->hidden()) {
-			_editor.ensure_time_axis_view_is_visible (**i);
+			_editor.ensure_time_axis_view_is_visible (**i, false);
 			(*i)->begin_name_edit ();
 		} 
 
@@ -705,7 +706,7 @@ TimeAxisView::end_name_edit (int response)
 		}
 		
 		if ((i != allviews.end()) && (*i != this) && !(*i)->hidden()) {
-			_editor.ensure_time_axis_view_is_visible (**i);
+			_editor.ensure_time_axis_view_is_visible (**i, false);
 			(*i)->begin_name_edit ();
 		} 
 	}
@@ -846,9 +847,9 @@ 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, 1, x2, y2));
+		rect->rect->set (ArdourCanvas::Rect (x1, 0, x2, y2));
 
 		// trim boxes are at the top for selections