Small cleanups to port matrix context menu.

[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 64ed8e04d95f4a0eb7531752da78f253a5dea136..0f107452a541554f6922b9b069df1faed7890765 100644 (file)
--- a/gtk2_ardour/global_port_matrix.cc
+++ b/gtk2_ardour/global_port_matrix.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2009 Paul Davis 
+    Copyright (C) 2009 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
 #include <gtkmm/image.h>
 #include <gtkmm/stock.h>
 #include "global_port_matrix.h"
+#include "utils.h"
 
 #include "ardour/bundle.h"
 #include "ardour/session.h"
@@ -30,8 +31,8 @@
 
 using namespace std;
 
-GlobalPortMatrix::GlobalPortMatrix (ARDOUR::Session& s, ARDOUR::DataType t)
-       : PortMatrix (s, t)
+GlobalPortMatrix::GlobalPortMatrix (Gtk::Window* p, ARDOUR::Session& s, ARDOUR::DataType t)
+       : PortMatrix (p, s, t)
 {
        setup_all_ports ();
 }
@@ -40,7 +41,7 @@ void
 GlobalPortMatrix::setup_ports (int dim)
 {
        _ports[dim].suspend_signals ();
-       _ports[dim].gather (_session, dim == IN);
+       _ports[dim].gather (_session, dim == IN, false);
        _ports[dim].resume_signals ();
 }
 
@@ -85,7 +86,7 @@ GlobalPortMatrix::get_state (ARDOUR::BundleChannel c[2]) const
                   so nothing to connect */
                return PortMatrixNode::UNKNOWN;
        }
-               
+
        for (ARDOUR::Bundle::PortList::const_iterator i = in_ports.begin(); i != in_ports.end(); ++i) {
                for (ARDOUR::Bundle::PortList::const_iterator j = out_ports.begin(); j != out_ports.end(); ++j) {
 
@@ -110,54 +111,25 @@ GlobalPortMatrix::get_state (ARDOUR::BundleChannel c[2]) const
 }
 
 GlobalPortMatrixWindow::GlobalPortMatrixWindow (ARDOUR::Session& s, ARDOUR::DataType t)
-       : _port_matrix (s, t)
+       : _port_matrix (this, s, t)
 {
        switch (t) {
        case ARDOUR::DataType::AUDIO:
-               set_title (_("Audio Connections Manager"));
+               set_title (_("Audio Connection Manager"));
                break;
        case ARDOUR::DataType::MIDI:
-               set_title (_("MIDI Connections Manager"));
+               set_title (_("MIDI Connection Manager"));
                break;
        }
 
        add (_port_matrix);
        show_all ();
-
-       /* XXX: hack to make the window full-size on opening.  This may not work for
-          people with very large monitors */
-       
-       resize (32768, 32768);
-
-       _port_matrix.MaxSizeChanged.connect (mem_fun (*this, &GlobalPortMatrixWindow::max_size_changed));
-}
-
-void
-GlobalPortMatrixWindow::on_realize ()
-{
-       Window::on_realize ();
-       set_max_size ();
-}
-
-void
-GlobalPortMatrixWindow::max_size_changed ()
-{
-       set_max_size ();
-       resize (32768, 32768);
 }
 
 void
-GlobalPortMatrixWindow::set_max_size ()
+GlobalPortMatrixWindow::on_show ()
 {
-       if ((get_flags() & Gtk::REALIZED) == 0) {
-               return;
-       }
-       
-       pair<uint32_t, uint32_t> const m = _port_matrix.max_size ();
-       
-       GdkGeometry g;
-       g.max_width = m.first;
-       g.max_height = m.second;
-
-       set_geometry_hints (*this, g, Gdk::HINT_MAX_SIZE);
+       Gtk::Window::on_show ();
+       pair<uint32_t, uint32_t> const pm_max = _port_matrix.max_size ();
+       resize_window_to_proportion_of_monitor (this, pm_max.first, pm_max.second);
 }