X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fport_matrix_column_labels.h;h=9ff59ec33bbfb5f8e2448bb8b29e2da0d859f1ea;hb=25b79d5647573f7620da4a97c9977333805f4da6;hp=6ed87e96285ce3e5332972134492b99c67143be8;hpb=a384dab13095f3d909e52eff9e6170ae55416601;p=ardour.git

diff --git a/gtk2_ardour/port_matrix_column_labels.h b/gtk2_ardour/port_matrix_column_labels.h
index 6ed87e9628..9ff59ec33b 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,7 +21,7 @@
 #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;
@@ -31,38 +31,42 @@ namespace ARDOUR {
 class PortMatrixNode;
 
 /** The column labels part of the port matrix */
-class PortMatrixColumnLabels : public PortMatrixComponent
+class PortMatrixColumnLabels : public PortMatrixLabels
 {
 public:
 	PortMatrixColumnLabels (PortMatrix *, PortMatrixBody *);
 
-	void button_press (double, double, int, uint32_t);
-  
+	void button_press (double, double, int, uint32_t, guint);
+
 	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, ARDOUR::BundleChannel const &);
-	double channel_x (ARDOUR::BundleChannel const &) const;
-	void queue_draw_for (PortMatrixNode const &);
 	std::vector<std::pair<double, double> > port_name_shape (double, double) const;
 
-	double slanted_height () const {
-		return _height - _highest_group_name - 2 * name_pad();
-	}
-
-	std::vector<boost::shared_ptr<ARDOUR::Bundle> > _bundles;
 	double _longest_bundle_name;
 	double _longest_channel_name;
-	double _highest_text;
-	double _highest_group_name;
+	double _text_height;
+	double _descender_height;
+	uint32_t _overhang;
 };
 
 #endif