Relayer punch/loop range rects, fix display of punch-in with no punch-out, ensure range selection rect is hidden after single click, move the track canvas up one pixel now that headers are all one size.

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3835 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 11 insertions, 13 deletions

diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index a0f6c8513f..53f114c962 100644
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -127,9 +127,20 @@ Editor::initialize_canvas ()
 
 	_master_group = new ArdourCanvas::Group (*track_canvas->root());
 
+	transport_loop_range_rect = new ArdourCanvas::SimpleRect (*_master_group, 0.0, 0.0, 0.0, 0.0);
+	transport_loop_range_rect->property_outline_pixels() = 1;
+	transport_loop_range_rect->hide();
+
+	transport_punch_range_rect = new ArdourCanvas::SimpleRect (*_master_group, 0.0, 0.0, 0.0, 0.0);
+	transport_punch_range_rect->property_outline_pixels() = 0;
+	transport_punch_range_rect->hide();
+
 	/* a group to hold time (measure) lines */	
 	time_line_group = new ArdourCanvas::Group (*_master_group, 0.0, 0.0);
 
+	range_marker_drag_rect = new ArdourCanvas::SimpleRect (*time_line_group, 0.0, 0.0, 0.0, 0.0);
+	range_marker_drag_rect->hide ();
+
 	_trackview_group = new ArdourCanvas::Group (*_master_group);
 	_region_motion_group = new ArdourCanvas::Group (*_trackview_group);
 
@@ -163,9 +174,6 @@ Editor::initialize_canvas ()
  	cd_marker_bar->property_outline_what() = (0x1 | 0x8);
  	cd_marker_bar->property_outline_pixels() = 0;
 
-	range_marker_drag_rect = new ArdourCanvas::SimpleRect (*time_line_group, 0.0, 0.0, 0.0, 0.0);
-	range_marker_drag_rect->hide ();
-
 	timebar_group =  new ArdourCanvas::Group (*track_canvas->root(), 0.0, 0.0);
 	cursor_group = new ArdourCanvas::Group (*track_canvas->root(), 0.0, 0.0);
 
@@ -196,16 +204,6 @@ Editor::initialize_canvas ()
 	transport_bar_drag_rect->property_outline_pixels() = 0;
 	transport_bar_drag_rect->hide ();
 
-	transport_loop_range_rect = new ArdourCanvas::SimpleRect (*_master_group, 0.0, 0.0, 0.0, 0.0);
-	transport_loop_range_rect->property_outline_pixels() = 1;
-	transport_loop_range_rect->hide();
-
-	transport_punch_range_rect = new ArdourCanvas::SimpleRect (*_master_group, 0.0, 0.0, 0.0, 0.0);
-	transport_punch_range_rect->property_outline_pixels() = 0;
-	transport_punch_range_rect->hide();
-	
-	transport_loop_range_rect->lower_to_bottom (); // loop on the bottom
-
 	transport_punchin_line = new ArdourCanvas::SimpleLine (*_master_group);
 	transport_punchin_line->property_x1() = 0.0;
 	transport_punchin_line->property_y1() = 0.0;