Compact the port matrix slightly, and fix a couple of minor layout bugs.

git-svn-id: svn://localhost/ardour2/branches/3.0@6068 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/port_matrix_column_labels.cc b/gtk2_ardour/port_matrix_column_labels.cc
index 70476af7af96a19ae3566fb510d88b50be51388c..dfa14f1d89835fac21b068a9df3c52b3537765c1 100644 (file)
--- a/gtk2_ardour/port_matrix_column_labels.cc
+++ b/gtk2_ardour/port_matrix_column_labels.cc
@@ -374,7 +374,7 @@ PortMatrixColumnLabels::render_bundle_name (
 
                cairo_move_to (
                        cr,
-                       xoff + basic_text_x_pos (0),
+                       xoff + basic_text_x_pos (0) + name_pad() * cos (angle ()),
                        yoff + slanted_height() - name_pad() * sin (angle())
                        );
        }

diff --git a/gtk2_ardour/port_matrix_component.h b/gtk2_ardour/port_matrix_component.h
index d4cc8619b6bf6d401f7316eb09d92d796236a542..3d9e5488b4885b23eec83d0894ae0edee16381e2 100644 (file)
--- a/gtk2_ardour/port_matrix_component.h
+++ b/gtk2_ardour/port_matrix_component.h
@@ -74,7 +74,7 @@ public:
 
        /** @return grid spacing */
        static uint32_t grid_spacing () {
-               return 32;
+               return 24;
        }
 
 protected:
@@ -101,7 +101,7 @@ protected:
 
        /** @return space around the connection indicator */
        static uint32_t connection_indicator_pad () {
-               return 8;
+               return 6;
        }
 
        static uint32_t mouseover_line_width () {

diff --git a/gtk2_ardour/port_matrix_row_labels.cc b/gtk2_ardour/port_matrix_row_labels.cc
index 21efda897e34f7bbd20938ed0554cd47c652426b..e9dd59b695581546f849ee7bb9d10514b0bc300b 100644 (file)
--- a/gtk2_ardour/port_matrix_row_labels.cc
+++ b/gtk2_ardour/port_matrix_row_labels.cc
@@ -289,7 +289,9 @@ PortMatrixRowLabels::render_bundle_name (
        cairo_set_line_width (cr, label_border_width ());
        cairo_stroke (cr);
 
-       double const off = grid_spacing() / 2;
+       cairo_text_extents_t ext;
+       cairo_text_extents (cr, b->name().c_str(), &ext);
+       double const off = (grid_spacing() - ext.height) / 2;
 
        set_source_rgb (cr, text_colour());
        cairo_move_to (cr, xoff + x + name_pad(), yoff + name_pad() + off);