diff options
author | Carl Hetherington <carl@carlh.net> | 2009-01-30 15:08:09 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2009-01-30 15:08:09 +0000 |
commit | a384dab13095f3d909e52eff9e6170ae55416601 (patch) | |
tree | c8af98d36927095909f54d3e8e8819af4c98b184 /gtk2_ardour/port_matrix_body.h | |
parent | 24aab941eb4d77e5bdf3933b11f8ce5659872b52 (diff) |
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
Diffstat (limited to 'gtk2_ardour/port_matrix_body.h')
-rw-r--r-- | gtk2_ardour/port_matrix_body.h | 32 |
1 files changed, 3 insertions, 29 deletions
diff --git a/gtk2_ardour/port_matrix_body.h b/gtk2_ardour/port_matrix_body.h index b1ec6e2ada..3692e05ec5 100644 --- a/gtk2_ardour/port_matrix_body.h +++ b/gtk2_ardour/port_matrix_body.h @@ -30,29 +30,13 @@ class PortMatrix; /** The main body of the port matrix. It is made up of three parts: * column labels, grid and row labels, each drawn using cairo. - * This class handles the arrangement of these parts. */ class PortMatrixBody : public Gtk::EventBox { public: - enum Arrangement { - TOP_AND_RIGHT, - BOTTOM_AND_LEFT - }; + PortMatrixBody (PortMatrix *); - PortMatrixBody (PortMatrix *, Arrangement); - - /** @return ports to offer for columns */ - PortGroupList const & column_ports () { - return _column_ports; - } - - /** @return ports to offer for rows */ - PortGroupList const & row_ports () { - return _row_ports; - } - - void setup (PortGroupList const &, PortGroupList const &); + void setup (); uint32_t full_scroll_width (); uint32_t alloc_scroll_width (); @@ -75,10 +59,6 @@ public: return _mouseover; } - Arrangement arrangement () const { - return _arrangement; - } - protected: bool on_expose_event (GdkEventExpose *); void on_size_request (Gtk::Requisition *); @@ -93,12 +73,11 @@ private: void rebuild_and_draw_row_labels (); void update_bundles (); - PortMatrix* _port_matrix; + PortMatrix* _matrix; PortMatrixColumnLabels _column_labels; PortMatrixRowLabels _row_labels; PortMatrixGrid _grid; - Arrangement _arrangement; uint32_t _alloc_width; ///< allocated width uint32_t _alloc_height; ///< allocated height Gdk::Rectangle _column_labels_rect; @@ -108,11 +87,6 @@ private: uint32_t _yoffset; bool _pointer_inside; - /// bundles to offer for columns - PortGroupList _column_ports; - /// bundles to offer for rows - PortGroupList _row_ports; - PortMatrixNode _mouseover; std::list<sigc::connection> _bundle_connections; |