return (llabs(cx-tx) < CONTROL_W/2 && llabs(cy-ty) < CONTROL_H/2);
}
+
int CWindowCanvas::do_mask(int &redraw, int &rerender,
int button_press, int cursor_motion, int draw)
{
float canvas_x = (x0 - half_track_w) * projector_z + projector_x;
float canvas_y = (y0 - half_track_h) * projector_z + projector_y;
// Test first point
- if(gui->shift_down()) {
+ if(gui->ctrl_down()) {
float control_x = (x1 - half_track_w) * projector_z + projector_x;
float control_y = (y1 - half_track_h) * projector_z + projector_y;
float distance = line_dist(control_x,control_y, mask_cursor_x,mask_cursor_y);
}
}
else {
- if(!gui->ctrl_down()) {
+ if(!gui->shift_down()) {
if(test_bbox(cursor_x, cursor_y, canvas_x, canvas_y)) {
selected_point = i;
}
canvas_x = (x3 - half_track_w) * projector_z + projector_x;
canvas_y = (y3 - half_track_h) * projector_z + projector_y;
- if(gui->shift_down()) {
+ if(gui->ctrl_down()) {
float control_x = (x2 - half_track_w) * projector_z + projector_x;
float control_y = (y2 - half_track_h) * projector_z + projector_y;
float distance = line_dist(control_x,control_y, mask_cursor_x,mask_cursor_y);
}
}
else if(i < points.size() - 1) {
- if(!gui->ctrl_down()) {
+ if(!gui->shift_down()) {
if(test_bbox(cursor_x, cursor_y, canvas_x, canvas_y)) {
selected_point = (i < points.size() - 1 ? i + 1 : 0);
}
gui->current_operation = mwindow->edl->session->cwindow_operation;
}
else // No existing point or control point was selected so create a new one
- if(!gui->shift_down() && !gui->alt_down()) {
+ if(!gui->ctrl_down() && !gui->alt_down()) {
mwindow->undo->update_undo_before(_("mask point"), 0);
// Create the template
MaskPoint *point = new MaskPoint;
over_point = 1;
}
- if(!over_point && gui->shift_down()) {
+ if(!over_point && gui->ctrl_down()) {
canvas_x = (x1 - half_track_w) * projector_z + projector_x;
canvas_y = (y1 - half_track_h) * projector_z + projector_y;
output_to_canvas(mwindow->edl, 0, canvas_x, canvas_y);
return result;
}
-
int CWindowCanvas::do_eyedrop(int &rerender, int button_press, int draw)
{
int result = 0;