Add right click handler to matrix to allow connecting groups that are

open


git-svn-id: file:///home/vcs/svn/jsweeper/trunk@23 6611ac79-6612-48ef-a1e9-b906f853523e
master
petern 2009-12-01 10:09:25 +00:00
parent 962e84ba07
commit 8fc3ab0c14
1 changed files with 42 additions and 12 deletions

View File

@ -608,6 +608,7 @@ bool Matrix::on_button_press_event(GdkEventButton *event)
if (p->rect.HitX(x)) p1 = p;
if (p->rect.HitY(y)) p2 = p;
if (p1 != NULL && p2 != NULL) break;
if (p1 != NULL && p2 != NULL) {
pm.ToggleConnect(p1, p2);
return true;
@ -617,18 +618,47 @@ bool Matrix::on_button_press_event(GdkEventButton *event)
if (pg->rect.HitX(x)) pg1 = pg;
if (pg->rect.HitY(y)) pg2 = pg;
if (p1 != NULL && pg2 != NULL) {
pm.ToggleConnect(p1, pg2);
return true;
}
if (pg1 != NULL && p2 != NULL) {
pm.ToggleConnect(pg1, p2);
return true;
}
if (pg1 != NULL && pg2 != NULL) {
pm.ToggleConnect(pg1, pg2);
return true;
}
if (pg1 != NULL && pg2 != NULL) break;
}
}
if (event->button == 3) {
// Right button pressed
// Try groups first
if (pg1 != NULL && pg2 != NULL) {
pm.ToggleConnect(pg1, pg2);
return true;
}
if (pg1 != NULL && p2 != NULL) {
pm.ToggleConnect(pg1, p2);
return true;
}
if (p1 != NULL && pg2 != NULL) {
pm.ToggleConnect(p1, pg2);
return true;
}
if (p1 != NULL && p2 != NULL) {
pm.ToggleConnect(p1, p2);
return true;
}
} else if (event->button == 1) {
// Left button pressed
// Try ports first
if (p1 != NULL && p2 != NULL) {
pm.ToggleConnect(p1, p2);
return true;
}
if (p1 != NULL && pg2 != NULL) {
pm.ToggleConnect(p1, pg2);
return true;
}
if (pg1 != NULL && p2 != NULL) {
pm.ToggleConnect(pg1, p2);
return true;
}
if (pg1 != NULL && pg2 != NULL) {
pm.ToggleConnect(pg1, pg2);
return true;
}
}