Fix editor sizing issue introduced in 4dc65e66

[ardour.git] / gtk2_ardour / port_matrix_grid.h

diff --git a/gtk2_ardour/port_matrix_grid.h b/gtk2_ardour/port_matrix_grid.h
index 945ba5a2e6a0934fe028928205274e72520fa6f7..383db2d42bdccb9478c37374f8ee551fdbb9da97 100644 (file)
--- a/gtk2_ardour/port_matrix_grid.h
+++ b/gtk2_ardour/port_matrix_grid.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
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef  __gtk_ardour_port_matrix_grid_h__ 
-#define  __gtk_ardour_port_matrix_grid_h__ 
+#ifndef  __gtk_ardour_port_matrix_grid_h__
+#define  __gtk_ardour_port_matrix_grid_h__
 
 #include <string>
 #include <vector>
@@ -26,6 +26,7 @@
 #include "ardour/types.h"
 #include "port_matrix_component.h"
 #include "port_matrix_types.h"
+#include "port_group.h"
 
 class PortMatrix;
 class PortMatrixBody;
@@ -34,33 +35,45 @@ namespace ARDOUR {
        class Bundle;
 }
 
-/// The grid part of the port matrix
+/**  The grid part of the port matrix */
 class PortMatrixGrid : public PortMatrixComponent
 {
 public:
        PortMatrixGrid (PortMatrix *, PortMatrixBody *);
 
-       void button_press (double, double, int);
-       void mouseover_event (double, double);
+       void button_press (double, double, GdkEventButton *);
+       void button_release (double, double, GdkEventButton *);
+       void motion (double, double);
 
        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 mouseover_changed (std::list<PortMatrixNode> const &);
        void draw_extra (cairo_t *);
 
 private:
-       
+
        void compute_dimensions ();
        void render (cairo_t *);
+       void render_group_pair (cairo_t *, boost::shared_ptr<const PortGroup>, boost::shared_ptr<const PortGroup>, uint32_t, uint32_t);
 
-       double channel_position (PortMatrixBundleChannel, ARDOUR::BundleList const &, double) const;
        PortMatrixNode position_to_node (double, double) const;
-       PortMatrixBundleChannel position_to_channel (double, ARDOUR::BundleList const &, double) const;
-       void queue_draw_for (PortMatrixNode const &);
+       void queue_draw_for (std::list<PortMatrixNode> const &);
+       void draw_association_indicator (cairo_t *, uint32_t, uint32_t, double p = 1);
+       void draw_empty_square (cairo_t *, uint32_t, uint32_t);
+       void draw_non_connectable_indicator (cairo_t *, uint32_t, uint32_t);
+       std::list<PortMatrixNode> nodes_on_line (int, int, int, int) const;
+       void set_association (PortMatrixNode, bool);
+       bool toggle_state (PortMatrixNode::State) const;
 
-       PortMatrix* _port_matrix;
+       bool _dragging;
+       bool _drag_valid;
+       bool _moved;
+       int _drag_start_x;
+       int _drag_start_y;
+       int _drag_x;
+       int _drag_y;
 };
 
 #endif