A more correct fix for non-disappearing loop/punch range rect, calculate track height in fit_tracks () correctly (doesn't fix the height race condition with the controls layout though).

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

3 files changed, 5 insertions, 9 deletions

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 014f0d5da2..f17a1c6336 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -1499,7 +1499,7 @@ public:
 	void new_transport_marker_menu_set_punch ();
 	void update_loop_range_view (bool visibility=false);
 	void update_punch_range_view (bool visibility=false);
-        gint new_transport_marker_menu_popdown (GdkEventAny*);
+        void new_transport_marker_menu_popdown ();
 	void marker_context_menu (GdkEventButton*, ArdourCanvas::Item*);
 	void tm_marker_context_menu (GdkEventButton*, ArdourCanvas::Item*);
 	void transport_marker_context_menu (GdkEventButton*, ArdourCanvas::Item*);
diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index f502f60b7f..5f9741449b 100644
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -682,7 +682,7 @@ Editor::build_new_transport_marker_menu ()
 	items.push_back (MenuElem (_("Set Loop Range"), mem_fun(*this, &Editor::new_transport_marker_menu_set_loop)));
 	items.push_back (MenuElem (_("Set Punch Range"), mem_fun(*this, &Editor::new_transport_marker_menu_set_punch)));
 
-	new_transport_marker_menu->signal_unmap_event().connect ( mem_fun(*this, &Editor::new_transport_marker_menu_popdown)); 
+	new_transport_marker_menu->signal_unmap().connect ( mem_fun(*this, &Editor::new_transport_marker_menu_popdown)); 
 }
 
 void
@@ -1112,27 +1112,23 @@ Editor::marker_menu_rename ()
 	commit_reversible_command ();
 }
 
-gint
-Editor::new_transport_marker_menu_popdown (GdkEventAny *ev)
+void
+Editor::new_transport_marker_menu_popdown ()
 {
 	// hide rects
 	transport_bar_drag_rect->hide();
 	range_marker_drag_rect->hide();
-
-	return FALSE;
 }
 
 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"));
 }
 
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index a32142b99d..814ad5236a 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -6020,7 +6020,7 @@ Editor::fit_tracks ()
 		child_heights += ((*t)->effective_height - (*t)->current_height());
 	}
 
-	uint32_t h = (uint32_t) floor ((canvas_height - child_heights)/selection->tracks.size());
+	uint32_t h = (uint32_t) floor ((canvas_height - child_heights - canvas_timebars_vsize)/selection->tracks.size());
 	double first_y_pos = DBL_MAX;
 
 	undo_visual_stack.push_back (current_visual_state());