initial redesign of canvas scrolling to facilitate independent x- and y-axis scrolling of specific groups within the canvas.

This commit should cause no change in behaviour, but contains all the code and changes necessary
for the next step

3 files changed, 22 insertions, 9 deletions

diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index 1736da96cb..2b491e7974 100644
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -65,10 +65,8 @@ Editor::initialize_canvas ()
 {
 	_track_canvas_viewport = new ArdourCanvas::GtkCanvasViewport (horizontal_adjustment, vertical_adjustment);
 	_track_canvas = _track_canvas_viewport->canvas ();
+	//_track_canvas->set_global_scroll (false);
 
-	_time_bars_canvas_viewport = new ArdourCanvas::GtkCanvasViewport (horizontal_adjustment, unused_adjustment);
-	_time_bars_canvas = _time_bars_canvas_viewport->canvas ();
-	
 	_verbose_cursor = new VerboseCursor (this);
 
 	/* on the bottom, an image */
@@ -100,7 +98,15 @@ Editor::initialize_canvas ()
 	CANVAS_DEBUG_NAME (time_line_group, "time line group");
 
 	_trackview_group = new ArdourCanvas::Group (_track_canvas->root());
+	//_trackview_group->set_scroll_sensitivity (ArdourCanvas::Group::ScrollSensitivity (ArdourCanvas::Group::ScrollsVertically|ArdourCanvas::Group::ScrollsHorizontally));	
 	CANVAS_DEBUG_NAME (_trackview_group, "Canvas TrackViews");
+	
+	
+	/* TIME BAR CANVAS */
+	
+	_time_bars_canvas_viewport = new ArdourCanvas::GtkCanvasViewport (horizontal_adjustment, unused_adjustment);
+	_time_bars_canvas = _time_bars_canvas_viewport->canvas ();
+		
 	_region_motion_group = new ArdourCanvas::Group (_trackview_group);
 	CANVAS_DEBUG_NAME (_region_motion_group, "Canvas Region Motion");
 
diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index 3cf3ef83b7..371feaff58 100644
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -1465,16 +1465,23 @@ Editor::update_punch_range_view ()
 	Location* tpl;
 
 	if ((_session->config.get_punch_in() || _session->config.get_punch_out()) && ((tpl = transport_punch_location()) != 0)) {
-		ArdourCanvas::Rect const v = _track_canvas->visible_area ();
 
+		double pixel_start;
+		double pixel_end;
+		
 		if (_session->config.get_punch_in()) {
-			transport_punch_range_rect->set_x0 (sample_to_pixel (tpl->start()));
-			transport_punch_range_rect->set_x1 (_session->config.get_punch_out() ? sample_to_pixel (tpl->end()) : sample_to_pixel (max_framepos));
+			pixel_start = sample_to_pixel (tpl->start());
+		} else {
+			pixel_start = 0;
+		}
+		if (_session->config.get_punch_out()) {
+			pixel_end = sample_to_pixel (tpl->end());
 		} else {
-			transport_punch_range_rect->set_x0 (0);
-			transport_punch_range_rect->set_x1 (_session->config.get_punch_out() ? sample_to_pixel (tpl->end()) : v.width ());
+			pixel_end = sample_to_pixel (max_framepos);
 		}
 		
+		transport_punch_range_rect->set_x0 (pixel_start);
+		transport_punch_range_rect->set_x1 (pixel_end);			
 		transport_punch_range_rect->show();
 
 	} else {
diff --git a/gtk2_ardour/tempo_lines.cc b/gtk2_ardour/tempo_lines.cc
index 828a4cc82b..917e141313 100644
--- a/gtk2_ardour/tempo_lines.cc
+++ b/gtk2_ardour/tempo_lines.cc
@@ -65,7 +65,7 @@ TempoLines::draw (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
 		  const ARDOUR::TempoMap::BBTPointList::const_iterator& end)
 {
 	ARDOUR::TempoMap::BBTPointList::const_iterator i;
-	ArdourCanvas::Rect const visible = _canvas.visible_area ();
+	ArdourCanvas::Rect const visible = _group->window_to_item (_canvas.visible_area ());
 	double  beat_density;
 
 	uint32_t beats = 0;