From a384dab13095f3d909e52eff9e6170ae55416601 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 30 Jan 2009 15:08:09 +0000 Subject: More port matrix re-working. Global matrix now has separate visibility buttons for ins and outs. The matrix will now be arranged so that more ports are labelled horizontally than vertically, to aid readability. git-svn-id: svn://localhost/ardour2/branches/3.0@4467 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/port_matrix_column_labels.h | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'gtk2_ardour/port_matrix_column_labels.h') diff --git a/gtk2_ardour/port_matrix_column_labels.h b/gtk2_ardour/port_matrix_column_labels.h index 9021ec55e3..6ed87e9628 100644 --- a/gtk2_ardour/port_matrix_column_labels.h +++ b/gtk2_ardour/port_matrix_column_labels.h @@ -25,23 +25,19 @@ namespace ARDOUR { class Bundle; + class BundleChannel; } class PortMatrixNode; -class PortMatrixBundleChannel; /** The column labels part of the port matrix */ class PortMatrixColumnLabels : public PortMatrixComponent { public: + PortMatrixColumnLabels (PortMatrix *, PortMatrixBody *); - enum Location { - TOP, - BOTTOM - }; - - PortMatrixColumnLabels (PortMatrixBody *, Location); - + void button_press (double, double, int, uint32_t); + double component_to_parent_x (double x) const; double parent_to_component_x (double x) const; double component_to_parent_y (double y) const; @@ -53,9 +49,10 @@ private: void render (cairo_t *); void compute_dimensions (); double basic_text_x_pos (int) const; - void render_port_name (cairo_t *, Gdk::Color, double, double, PortMatrixBundleChannel const &); - double channel_x (PortMatrixBundleChannel const &) const; + void render_port_name (cairo_t *, Gdk::Color, double, double, ARDOUR::BundleChannel const &); + double channel_x (ARDOUR::BundleChannel const &) const; void queue_draw_for (PortMatrixNode const &); + std::vector > port_name_shape (double, double) const; double slanted_height () const { return _height - _highest_group_name - 2 * name_pad(); @@ -66,7 +63,6 @@ private: double _longest_channel_name; double _highest_text; double _highest_group_name; - Location _location; }; #endif -- cgit v1.2.3