X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fport_matrix_column_labels.h;h=b3f2ed8c807f0feb294d993ca6674ae419468458;hb=22905d8a935534baecaf6cce540d103014f7095d;hp=9021ec55e38b75a2b9551f1b5be73ee18ce43657;hpb=b2e163a410a62a20e982b3baac0cf65e611acbce;p=ardour.git

diff --git a/gtk2_ardour/port_matrix_column_labels.h b/gtk2_ardour/port_matrix_column_labels.h
index 9021ec55e3..b3f2ed8c80 100644
--- a/gtk2_ardour/port_matrix_column_labels.h
+++ b/gtk2_ardour/port_matrix_column_labels.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2002-2009 Paul Davis 
+    Copyright (C) 2002-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
@@ -21,52 +21,52 @@
 #define __port_matrix_column_labels_h__
 
 #include <boost/shared_ptr.hpp>
-#include "port_matrix_component.h"
+#include "port_matrix_labels.h"
 
 namespace ARDOUR {
 	class Bundle;
+	class BundleChannel;
 }
 
 class PortMatrixNode;
-class PortMatrixBundleChannel;
 
 /** The column labels part of the port matrix */
-class PortMatrixColumnLabels : public PortMatrixComponent
+class PortMatrixColumnLabels : public PortMatrixLabels
 {
 public:
+	PortMatrixColumnLabels (PortMatrix *, PortMatrixBody *);
 
-	enum Location {
-		TOP,
-		BOTTOM
-	};
-	
-	PortMatrixColumnLabels (PortMatrixBody *, Location);
+	void button_press (double, double, GdkEventButton *);
 
 	double component_to_parent_x (double x) const;
 	double parent_to_component_x (double x) const;
 	double component_to_parent_y (double y) const;
 	double parent_to_component_y (double y) const;
-	void mouseover_changed (PortMatrixNode const &);
-	void draw_extra (cairo_t *);
+	void mouseover_changed (std::list<PortMatrixNode> const &);
+	void motion (double, double);
+
+	uint32_t overhang () const {
+		return _overhang;
+	}
 
 private:
+	void render_bundle_name (cairo_t *, Gdk::Color, Gdk::Color, double, double, boost::shared_ptr<ARDOUR::Bundle>);
+	void render_channel_name (cairo_t *, Gdk::Color, Gdk::Color, double, double, ARDOUR::BundleChannel const &);
+	double channel_x (ARDOUR::BundleChannel const &) const;
+	double channel_y (ARDOUR::BundleChannel const &) const;
+	void queue_draw_for (ARDOUR::BundleChannel const &);
+	ARDOUR::BundleChannel position_to_channel (double, double, boost::shared_ptr<const PortGroup>) const;
+
 	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 queue_draw_for (PortMatrixNode const &);
-
-	double slanted_height () const {
-		return _height - _highest_group_name - 2 * name_pad();
-	}
+	std::vector<std::pair<double, double> > port_name_shape (double, double) const;
 
-	std::vector<boost::shared_ptr<ARDOUR::Bundle> > _bundles;
 	double _longest_bundle_name;
 	double _longest_channel_name;
-	double _highest_text;
-	double _highest_group_name;
-	Location _location;
+	double _text_height;
+	double _descender_height;
+	uint32_t _overhang;
 };
 
 #endif