X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fport_matrix_body.h;h=23d07c6ff3f9c083e0f73f333278df9f0260a4e1;hb=00f12dc39582996ef930ce5caeeb3e2ecc32140e;hp=c905a98dc48d4d53859b61e1fd30b735409c6b32;hpb=67d545c0809522e8d32b919941f2be56d94c7ba3;p=ardour.git

diff --git a/gtk2_ardour/port_matrix_body.h b/gtk2_ardour/port_matrix_body.h
index c905a98dc4..23d07c6ff3 100644
--- a/gtk2_ardour/port_matrix_body.h
+++ b/gtk2_ardour/port_matrix_body.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
@@ -28,6 +28,7 @@ class PortMatrix;
 class PortMatrixColumnLabels;
 class PortMatrixRowLabels;
 class PortMatrixGrid;
+class PortMatrixComponent;
 
 /** The main body of the port matrix.  It is made up of three parts:
  *  column labels, grid and row labels, each drawn using cairo.
@@ -55,14 +56,21 @@ public:
 	void set_yoffset (uint32_t);
 
 	void rebuild_and_draw_grid ();
-	
+
 	void set_mouseover (PortMatrixNode const &);
-	PortMatrixNode mouseover () const {
+	void set_mouseover (std::list<PortMatrixNode> const &);
+	std::list<PortMatrixNode> mouseover () const {
 		return _mouseover;
 	}
 
-	void highlight_associated_channels (int, uint32_t);
+	void highlight_associated_channels (int, ARDOUR::BundleChannel);
 	void component_size_changed ();
+	std::pair<uint32_t, uint32_t> max_size () const;
+
+	uint32_t column_labels_border_x () const;
+	uint32_t column_labels_height () const;
+
+	sigc::signal<void> DimensionsChanged;
 
 protected:
 	bool on_expose_event (GdkEventExpose *);
@@ -72,7 +80,7 @@ protected:
 	bool on_button_release_event (GdkEventButton *);
 	bool on_leave_notify_event (GdkEventCrossing *);
 	bool on_motion_notify_event (GdkEventMotion *);
-	
+
 private:
 	void compute_rectangles ();
 	void rebuild_and_draw_column_labels ();
@@ -84,19 +92,19 @@ private:
 	PortMatrixColumnLabels* _column_labels;
 	PortMatrixRowLabels* _row_labels;
 	PortMatrixGrid* _grid;
+	std::list<PortMatrixComponent*> _components;
 
 	uint32_t _alloc_width; ///< allocated width
 	uint32_t _alloc_height; ///< allocated height
-	Gdk::Rectangle _column_labels_rect;
-	Gdk::Rectangle _row_labels_rect;
-	Gdk::Rectangle _grid_rect;
 	uint32_t _xoffset;
 	uint32_t _yoffset;
+	uint32_t _column_labels_border_x;
+	uint32_t _column_labels_height;
 
-	PortMatrixNode _mouseover;
-	bool _mouse_over_grid;
+	std::list<PortMatrixNode> _mouseover;
+	bool _ignore_component_size_changed;
 
-	std::list<sigc::connection> _bundle_connections;
+	PBD::ScopedConnectionList _bundle_connections;
 };
 
 #endif