diff options
author | Carl Hetherington <carl@carlh.net> | 2009-11-12 01:58:20 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2009-11-12 01:58:20 +0000 |
commit | c3d8d38f7f96667b415e2808e202fbb9227207c9 (patch) | |
tree | 25a8d44a0c571c76e81e9ab8b5a7cc899af5eaa6 /gtk2_ardour | |
parent | b49830d1a04a3e50fa8a666e2e7c25e81c1cf2f6 (diff) |
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
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/port_matrix_column_labels.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/port_matrix_component.h | 4 | ||||
-rw-r--r-- | gtk2_ardour/port_matrix_row_labels.cc | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/gtk2_ardour/port_matrix_column_labels.cc b/gtk2_ardour/port_matrix_column_labels.cc index 70476af7af..dfa14f1d89 100644 --- 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 d4cc8619b6..3d9e5488b4 100644 --- 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 21efda897e..e9dd59b695 100644 --- 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); |