ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

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
This commit is contained in:
Carl Hetherington 2009-11-18 14:53:55 +00:00
parent 0f313672f5
commit b7cfd2849e
3 changed files with 36 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gtk2_ardour/port_matrix_body.cc
View File

@ -328,14 +328,19 @@ PortMatrixBody::on_button_press_event (GdkEventButton* ev)
bool
PortMatrixBody::on_button_release_event (GdkEventButton* ev)
{
if (Gdk::Region (_grid->parent_rectangle()).point_in (ev->x, ev->y)) {
_grid->button_release (
_grid->parent_to_component_x (ev->x),
_grid->parent_to_component_y (ev->y),
ev->button, ev->time
);
for (list<PortMatrixComponent*>::iterator i = _components.begin(); i != _components.end(); ++i) {
if (Gdk::Region ((*i)->parent_rectangle()).point_in (ev->x, ev->y)) {
(*i)->button_release (
(*i)->parent_to_component_x (ev->x),
(*i)->parent_to_component_y (ev->y),
ev->button, ev->time
);
} else {
(*i)->button_release (
-1, -1,
ev->button, ev->time
);
}
}
return true;

1
gtk2_ardour/port_matrix_component.h
View File

@ -50,6 +50,7 @@ public:
virtual void mouseover_changed (std::list<PortMatrixNode> const &) = 0;
virtual void draw_extra (cairo_t *) = 0;
virtual void button_press (double, double, int, uint32_t) {}
virtual void button_release (double, double, int, uint32_t) {}
virtual void motion (double, double) {}
void set_show_ports (bool);

40
gtk2_ardour/port_matrix_grid.cc
View File

@ -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<PortMatrixNode> 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<PortMatrixNode>::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<PortMatrixNode> 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<PortMatrixNode>::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 ();
}