From 51bdbf692593b22fed05878843c6754ec41745cf Mon Sep 17 00:00:00 2001
From: Carl Hetherington <carl@carlh.net>
Date: Wed, 18 Nov 2009 14:04:59 +0000
Subject: [PATCH] Port port group type labels in-line with the tabs.

git-svn-id: svn://localhost/ardour2/branches/3.0@6118 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/port_matrix.cc | 19 +++++++++++--------
 gtk2_ardour/port_matrix.h  |  2 ++
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/gtk2_ardour/port_matrix.cc b/gtk2_ardour/port_matrix.cc
index ae6fcd1147..00a7f819e2 100644
--- a/gtk2_ardour/port_matrix.cc
+++ b/gtk2_ardour/port_matrix.cc
@@ -46,7 +46,7 @@ using namespace ARDOUR;
  *  @param type Port type that we are handling.
  */
 PortMatrix::PortMatrix (Window* parent, Session& session, DataType type)
-	: Table (4, 4),
+	: Table (3, 3),
 	  _session (session),
 	  _parent (parent),
 	  _type (type),
@@ -61,13 +61,16 @@ PortMatrix::PortMatrix (Window* parent, Session& session, DataType type)
 {
 	_body = new PortMatrixBody (this);
 
-	attach (*_body, 2, 3, 2, 3);
-	attach (_vscroll, 3, 4, 2, 3, SHRINK);
-	attach (_hscroll, 2, 3, 3, 4, FILL | EXPAND, SHRINK);
-	attach (_vlabel, 0, 1, 2, 3, SHRINK);
-	attach (_hlabel, 2, 3, 0, 1, FILL | EXPAND, SHRINK);
-	attach (_vnotebook, 1, 2, 2, 3, SHRINK);
-	attach (_hnotebook, 2, 3, 1, 2, FILL | EXPAND, SHRINK);
+	_vbox.pack_start (_vnotebook);
+	_vbox.pack_start (_vlabel);
+	_hbox.pack_start (_hnotebook);
+	_hbox.pack_start (_hlabel);
+
+	attach (*_body, 1, 2, 1, 2);
+	attach (_vscroll, 2, 3, 1, 2, SHRINK);
+	attach (_hscroll, 1, 2, 2, 3, FILL | EXPAND, SHRINK);
+	attach (_vbox, 0, 1, 1, 2, SHRINK);
+	attach (_hbox, 1, 2, 0, 1, FILL | EXPAND, SHRINK);
 
 	_vnotebook.signal_switch_page().connect (mem_fun (*this, &PortMatrix::v_page_selected));
 	_hnotebook.signal_switch_page().connect (mem_fun (*this, &PortMatrix::h_page_selected));
diff --git a/gtk2_ardour/port_matrix.h b/gtk2_ardour/port_matrix.h
index 93afd0310e..d073740bf5 100644
--- a/gtk2_ardour/port_matrix.h
+++ b/gtk2_ardour/port_matrix.h
@@ -192,6 +192,8 @@ private:
 	Gtk::Notebook _hnotebook;
 	Gtk::Label _vlabel;
 	Gtk::Label _hlabel;
+	Gtk::VBox _vbox;
+	Gtk::HBox _hbox;
 	Gtk::Menu* _menu;
 	Arrangement _arrangement;
 	int _row_index;