Trim note display to not overlap the end of its region. Should fix #3202 and #2143.

[ardour.git] / gtk2_ardour / global_port_matrix.cc

diff --git a/gtk2_ardour/global_port_matrix.cc b/gtk2_ardour/global_port_matrix.cc
index 510d3b3ce3cea99897d60be3a24bebda26eb5f19..98760c863e915881a4c51a33b3aea96c00fcd609 100644 (file)
--- a/gtk2_ardour/global_port_matrix.cc
+++ b/gtk2_ardour/global_port_matrix.cc
@@ -42,7 +42,7 @@ void
 GlobalPortMatrix::setup_ports (int dim)
 {
        _ports[dim].suspend_signals ();
-       _ports[dim].gather (_session, dim == IN, false);
+       _ports[dim].gather (_session, type(), dim == IN, false);
        _ports[dim].resume_signals ();
 }
 
@@ -166,6 +166,12 @@ GlobalPortMatrixWindow::on_show ()
        resize_window_to_proportion_of_monitor (this, pm_max.first, pm_max.second);
 }
 
+void
+GlobalPortMatrixWindow::set_session (ARDOUR::Session* s)
+{
+       _port_matrix.set_session (s);
+}
+
 string
 GlobalPortMatrix::disassociation_verb () const
 {