Fix non-disappearing transport range bar drag rects (longstanding bug), use physical_screen_height some more (avoids work during canvas size allocation).

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

2 files changed, 7 insertions, 10 deletions

diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index ab0ce85328..dd5050d16e 100644
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -135,18 +135,18 @@ 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 = new ArdourCanvas::SimpleRect (*_master_group, 0.0, 0.0, 0.0, physical_screen_height);
 	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 = new ArdourCanvas::SimpleRect (*_master_group, 0.0, 0.0, 0.0, physical_screen_height);
 	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 = new ArdourCanvas::SimpleRect (*time_line_group, 0.0, 0.0, 0.0, physical_screen_height);
 	range_marker_drag_rect->hide ();
 
 	_trackview_group = new ArdourCanvas::Group (*_master_group);
@@ -216,14 +216,14 @@ Editor::initialize_canvas ()
 	transport_punchin_line->property_x1() = 0.0;
 	transport_punchin_line->property_y1() = 0.0;
 	transport_punchin_line->property_x2() = 0.0;
-	transport_punchin_line->property_y2() = 0.0;
+	transport_punchin_line->property_y2() = physical_screen_height;
 	transport_punchin_line->hide ();
 	
 	transport_punchout_line  = new ArdourCanvas::SimpleLine (*_master_group);
 	transport_punchout_line->property_x1() = 0.0;
 	transport_punchout_line->property_y1() = 0.0;
 	transport_punchout_line->property_x2() = 0.0;
-	transport_punchout_line->property_y2() = 0.0;
+	transport_punchout_line->property_y2() = physical_screen_height;
 	transport_punchout_line->hide();
 	
 	// used to show zoom mode active zooming
@@ -323,11 +323,6 @@ Editor::track_canvas_size_allocated ()
 			(*x)->set_line_vpos (0, canvas_height);
 		}
 
-		range_marker_drag_rect->property_y2() = canvas_height;
-		transport_loop_range_rect->property_y2() = canvas_height;
-		transport_punch_range_rect->property_y2() = canvas_height;
-		transport_punchin_line->property_y2() = canvas_height;
-		transport_punchout_line->property_y2() = canvas_height;
 		vertical_adjustment.set_page_size (canvas_height);
 	}
 	horizontal_adjustment.set_upper (session->current_end_frame()/frames_per_unit);
diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index f70cf2092b..f502f60b7f 100644
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -1125,12 +1125,14 @@ Editor::new_transport_marker_menu_popdown (GdkEventAny *ev)
 void
 Editor::new_transport_marker_menu_set_loop ()
 {
+	transport_bar_drag_rect->hide ();
 	set_loop_range (temp_location->start(), temp_location->end(), _("set loop range"));
 }
 
 void
 Editor::new_transport_marker_menu_set_punch ()
 {
+	transport_bar_drag_rect->hide ();
 	set_punch_range (temp_location->start(), temp_location->end(), _("set punch range"));
 }