From b7cfd2849ebb0d949af3ee39f70cbf1856fbfe0f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 18 Nov 2009 14:53:55 +0000 Subject: Fix dragging grid lines when you move the mouse outside of the grid during the drag. git-svn-id: svn://localhost/ardour2/branches/3.0@6120 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/port_matrix_grid.cc | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) (limited to 'gtk2_ardour/port_matrix_grid.cc') diff --git a/gtk2_ardour/port_matrix_grid.cc b/gtk2_ardour/port_matrix_grid.cc index 53b4b50b50..c2af484e6c 100644 --- a/gtk2_ardour/port_matrix_grid.cc +++ b/gtk2_ardour/port_matrix_grid.cc @@ -359,29 +359,33 @@ PortMatrixGrid::button_release (double x, double y, int b, uint32_t /*t*/) { if (b == 1) { - if (_dragging && _moved) { - - if (_drag_valid) { - list const p = nodes_on_line (_drag_start_x, _drag_start_y, _drag_x, _drag_y); - - if (!p.empty()) { - PortMatrixNode::State const s = get_association (p.front()); - for (list::const_iterator i = p.begin(); i != p.end(); ++i) { - set_association (*i, toggle_state (s)); + if (x != -1) { + + if (_dragging && _moved) { + + if (_drag_valid) { + list const p = nodes_on_line (_drag_start_x, _drag_start_y, _drag_x, _drag_y); + + if (!p.empty()) { + PortMatrixNode::State const s = get_association (p.front()); + for (list::const_iterator i = p.begin(); i != p.end(); ++i) { + set_association (*i, toggle_state (s)); + } } } + + } else { + + PortMatrixNode const n = position_to_node (x, y); + if (n.row.bundle && n.column.bundle) { + PortMatrixNode::State const s = get_association (n); + set_association (n, toggle_state (s)); + } } - } else { - - PortMatrixNode const n = position_to_node (x, y); - if (n.row.bundle && n.column.bundle) { - PortMatrixNode::State const s = get_association (n); - set_association (n, toggle_state (s)); - } + require_render (); } - - require_render (); + _body->queue_draw (); } -- cgit v1.2.3