X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ftrackcanvas.C;h=3707a1eb1d3921a82c644ae1e763d15b86835b6c;hp=b2510711fa2c4361a120e526a4473e8fc7f10d9a;hb=f4cba337b328ed1842085076c3e2c8244e3a94bd;hpb=8a2d79c16c6793d7d3483e9a74205569228ca0cc

diff --git a/cinelerra-5.1/cinelerra/trackcanvas.C b/cinelerra-5.1/cinelerra/trackcanvas.C
index b2510711..3707a1eb 100644
--- a/cinelerra-5.1/cinelerra/trackcanvas.C
+++ b/cinelerra-5.1/cinelerra/trackcanvas.C
@@ -76,6 +76,7 @@
 #include "theme.h"
 #include "trackcanvas.h"
 #include "tracking.h"
+#include "trackpopup.h"
 #include "tracks.h"
 #include "transition.h"
 #include "transitionhandles.h"
@@ -144,7 +145,7 @@ void TrackCanvas::create_objects()
 	pankeyframe_pixmap = new BC_Pixmap(this, mwindow->theme->pankeyframe_data, PIXMAP_ALPHA);
 	projectorkeyframe_pixmap = new BC_Pixmap(this, mwindow->theme->projectorkeyframe_data, PIXMAP_ALPHA);
 	maskkeyframe_pixmap = new BC_Pixmap(this, mwindow->theme->maskkeyframe_data, PIXMAP_ALPHA);
-	draw();
+	draw(NORMAL_DRAW, 1);
 	update_cursor(0);
 	flash(0);
 }
@@ -152,7 +153,7 @@ void TrackCanvas::create_objects()
 void TrackCanvas::resize_event()
 {
 //printf("TrackCanvas::resize_event 1\n");
-	draw(0, 0);
+	draw(NORMAL_DRAW, 0);
 	flash(0);
 //printf("TrackCanvas::resize_event 2\n");
 }
@@ -183,17 +184,27 @@ int TrackCanvas::drag_motion_event()
 	return gui->drag_motion();
 }
 
-int TrackCanvas::drag_motion(Track **over_track,
-	Edit **over_edit,
-	PluginSet **over_pluginset,
-	Plugin **over_plugin)
+int TrackCanvas::drag_motion(
+		Track **over_track, Edit **over_edit,
+		PluginSet **over_pluginset, Plugin **over_plugin)
 {
 	int cursor_x = get_relative_cursor_x();
 	int cursor_y = get_relative_cursor_y();
+	if( get_cursor_over_window() ) {
+		drag_cursor_motion(cursor_x, cursor_y,
+			over_track, over_edit, over_pluginset, over_plugin);
+	}
+        if( over_track && !*over_track )
+		*over_track = pane->over_patchbay();
+	return 0;
+}
 
-	if( get_cursor_over_window() &&
-		cursor_x >= 0 && cursor_y >= 0 &&
-		cursor_x < get_w() && cursor_y < get_h() )
+int TrackCanvas::drag_cursor_motion(int cursor_x, int cursor_y,
+		Track **over_track, Edit **over_edit,
+		PluginSet **over_pluginset, Plugin **over_plugin)
+{
+	if( cursor_x >= 0 && cursor_y >= 0 &&
+	    cursor_x < get_w() && cursor_y < get_h() )
 	{
 //printf("TrackCanvas::drag_motion %d %d\n", __LINE__, pane->number);
 // Find the edit and track the cursor is over
@@ -259,9 +270,6 @@ int TrackCanvas::drag_motion(Track **over_track,
 		}
 	}
 
-        if( !*over_track )
-		*over_track = pane->over_patchbay();
-
 	return 0;
 }
 
@@ -491,6 +499,38 @@ int TrackCanvas::drag_stop(int *redraw)
 				result = 1;
 			}
 			break;
+		case DRAG_GROUP:
+			mwindow->session->current_operation = NO_OPERATION;
+			EDL *drag_group = mwindow->session->drag_group;
+			if( drag_group ) {
+				Track *drop_track = mwindow->session->track_highlighted;
+				Track *drag_track = mwindow->session->drag_group_first_track;
+				Edit *drag_edit = mwindow->session->drag_group_edit;
+				Track *edit_track = drag_edit ? drag_edit->track : 0;
+				while( drop_track && edit_track ) {
+					if( edit_track == drag_track ) break;
+					edit_track = edit_track->previous;
+					drop_track = drop_track->previous;
+				}
+				if( drop_track ) {
+					double cur_pos = mwindow->session->drag_group_position;
+					double new_pos = mwindow->edl->get_cursor_position(cursor_x, pane->number);
+					new_pos -= mwindow->session->drag_position - cur_pos;
+					new_pos = mwindow->edl->align_to_frame(new_pos, 0);
+					double drop_position = new_pos;
+					int ret = test_track_group(drag_group, drop_track, new_pos);
+					if( !ret && new_pos != drop_position ) {
+						ret = test_track_group(drag_group, drop_track, new_pos);
+					}
+					if( ret )
+						mwindow->move_group(drag_group, drop_track, new_pos, 1);
+					drag_group->remove_user();
+					mwindow->session->drag_group = 0;
+					mwindow->edl->tracks->clear_selected_edits();
+				}
+			}
+			result = 1;
+			break;
 		}
 	}
 
@@ -504,7 +544,10 @@ int TrackCanvas::drag_start_event()
 	int rerender = 0;
 	int new_cursor, update_cursor;
 
-	if(mwindow->session->current_operation != NO_OPERATION) return 0;
+	if( mwindow->session->current_operation == GROUP_TOGGLE )
+		mwindow->session->current_operation = NO_OPERATION;
+	else if( mwindow->session->current_operation != NO_OPERATION )
+		return 0;
 
 	if(is_event_win()) {
 		if(do_plugins(get_drag_x(), get_drag_y(),
@@ -545,7 +588,7 @@ int64_t TrackCanvas::drop_edit_position(int *is_insertion, Edit *moved_edit, int
 	Edit *last_edit = track->edits->last;
 	if( !last_edit || edit_position >= (last_edit->startproject+last_edit->length) ) {
 		*is_insertion = 0;
-		return grab_position;
+		return edit_position;
 	}
 
 	int64_t drop_start = 0, drop_end = 0;  // drop zone boundries
@@ -650,7 +693,6 @@ void TrackCanvas::draw(int mode, int hide_cursor)
 {
 	const int debug = 0;
 
-
 // Swap pixmap layers
 	if(get_w() != background_pixmap->get_w() ||
 		get_h() != background_pixmap->get_h())
@@ -699,7 +741,7 @@ void TrackCanvas::draw_indexes(Indexable *indexable)
 // Don't redraw raw samples
 	if(index_state->index_zoom > mwindow->edl->local_session->zoom_sample)
 		return;
-	draw_resources(0, 1, indexable);
+	draw_resources(NORMAL_DRAW, 1, indexable);
 	draw_overlays();
 	flash(0);
 }
@@ -1193,11 +1235,12 @@ void TrackCanvas::draw_paste_destination()
 								from_units(drop_edit_position(&insertion,
 									mwindow->session->drag_edit,
 									mwindow->session->drag_edit->length));
+							current_vedit++;
 						}
 					}
 					if( paste_position >= 0 ) {
 						position = paste_position;
-						current_vedit++;
+						current_vtrack++;
 						//draw_box = 1;
 					}
 					else
@@ -1529,7 +1572,40 @@ void TrackCanvas::draw_highlighting()
 //				}
 			}
 			break;
-
+		case DRAG_GROUP:
+			if( mwindow->session->track_highlighted && mwindow->session->drag_group &&
+			    mwindow->session->drag_group_edit && mwindow->session->drag_group_first_track ) {
+				Track *track = mwindow->session->track_highlighted;
+				EDL *drag_group = mwindow->session->drag_group;
+				Track *edit_track = mwindow->session->drag_group_edit->track;
+				Track *drag_track = mwindow->session->drag_group_first_track;
+				while( track && edit_track && edit_track != drag_track ) {
+					edit_track = edit_track->previous;
+					track = track->previous;
+				}
+				int cx = get_cursor_x();
+				double cur_pos = mwindow->session->drag_group_position;
+				double new_pos = mwindow->edl->get_cursor_position(cx, pane->number);
+				new_pos -= mwindow->session->drag_position - cur_pos;
+				new_pos = mwindow->edl->align_to_frame(new_pos, 0);
+				double drop_position = new_pos;
+				int color = GREEN;
+				int ret = test_track_group(drag_group, track, new_pos);
+				if( !ret && new_pos != drop_position ) {
+					double pos = new_pos;
+					pos += mwindow->session->drag_position - cur_pos;
+					cx = mwindow->edl->get_position_cursorx(pos, pane->number);
+					ret = test_track_group(drag_group, track, new_pos);
+					color = ret ? YELLOW : RED;
+				}
+				else if( !ret )
+					color = RED;
+				track_dimensions(mwindow->session->track_highlighted, x, y, w, h);
+				int dx = cx - mwindow->session->drag_origin_x;
+				int dy = y - mwindow->session->drag_origin_y;
+				draw_selected_edits(mwindow->edl, dx, dy, color, -1);
+			}
+			break;
 // Dragging an effect from the timeline
 		case DRAG_AEFFECT_COPY:
 		case DRAG_VEFFECT_COPY:
@@ -1590,10 +1666,32 @@ void TrackCanvas::draw_highlighting()
 
 	}
 
-
-	if(draw_box)
-	{
+	if( draw_box )
 		draw_highlight_rectangle(x, y, w, h);
+
+	draw_selected_edits(mwindow->edl, 0, 0, GREEN+BLUE, RED);
+}
+
+void TrackCanvas::draw_selected_edits(EDL *edl, int dx, int dy, int color0, int color1)
+{
+	for( Track *track=edl->tracks->first; track; track=track->next ) {
+		for( Edit *edit=track->edits->first; edit; edit=edit->next ) {
+			if( !edit->is_selected ) continue;
+			int64_t x, y, w, h;
+			edit_dimensions(edit, x, y, w, h);
+			x += dx;  y += dy;
+			if( !MWindowGUI::visible(x, x + w, 0, get_w()) ) continue;
+			if( !MWindowGUI::visible(y, y + h, 0, get_h()) ) continue;
+			set_opaque();
+			int inner = color1 < 0 ? color0 : !edit->group_id ? color0 :
+				mwindow->get_group_color(edit->group_id);
+			set_color(inner);
+			draw_rectangle(x, y, w, h);
+			int outer = color1 < 0 ? color0 : !edit->group_id ? color1 : inner;
+			set_color(outer);
+			draw_rectangle(x-1, y-1, w+2, h+2);
+			draw_rectangle(x-2, y-2, w+1, h+1);
+		}
 	}
 }
 
@@ -2185,13 +2283,13 @@ void TrackCanvas::draw_keyframe_reticle()
 	int autoidx = dragging && keyframe_hairline != HAIRLINE_ALWAYS ?
 		mwindow->session->drag_auto->autos->autoidx : -1;
 
-	if( get_buttonpress() == 1 && dragging &&
+	if( get_buttonpress() == LEFT_BUTTON && dragging &&
             keyframe_hairline == HAIRLINE_DRAGGING ) {
 		draw_hairline(mwindow->session->drag_auto, RED, 1);
 		return;
 	}
 
-	if( keyframe_hairline == HAIRLINE_ALWAYS || ( get_buttonpress() == 2 &&
+	if( keyframe_hairline == HAIRLINE_ALWAYS || ( get_buttonpress() == MIDDLE_BUTTON &&
 	    keyframe_hairline == HAIRLINE_DRAGGING && dragging ) ) {
 		int show = dragging || keyframe_hairline == HAIRLINE_ALWAYS ? 1 : 0;
 		for( Track *track = mwindow->edl->tracks->first; track; track=track->next ) {
@@ -4180,19 +4278,18 @@ int TrackCanvas::cursor_update(int in_motion)
 			}
 			break;
 
+		case DROP_TARGETING:
+			new_cursor = GRABBED_CURSOR;
+			result = 1;
+			break;
+
 		default:
 			if(is_event_win() && cursor_inside()) {
 // Update clocks
 				cursor_x = get_cursor_x();
-				position = (double)cursor_x *
-					(double)mwindow->edl->local_session->zoom_sample /
-					(double)mwindow->edl->session->sample_rate +
-					(double)mwindow->edl->local_session->view_start[pane->number] *
-					(double)mwindow->edl->local_session->zoom_sample /
-					(double)mwindow->edl->session->sample_rate;
+				position = mwindow->edl->get_cursor_position(cursor_x, pane->number);
 				position = mwindow->edl->align_to_frame(position, 0);
 				update_clock = 1;
-
 // set all timebars
 				for(int i = 0; i < TOTAL_PANES; i++)
 					if(gui->pane[i]) gui->pane[i]->canvas->timebar_position = position;
@@ -4439,22 +4536,60 @@ int TrackCanvas::button_release_event()
 			break;
 
 		case DRAG_EDIT:
+		case DRAG_GROUP:
 		case DRAG_AEFFECT_COPY:
 		case DRAG_VEFFECT_COPY:
 // Trap in drag stop
 			break;
 
+		case DROP_TARGETING: {
+			int cursor_x = get_cursor_x(), cursor_y = get_cursor_y();
+			Track *track=0;  Edit *edit=0;  PluginSet *pluginset=0;  Plugin *plugin=0;
+			drag_cursor_motion(cursor_x, cursor_y,
+				&track, &edit, &pluginset, &plugin);
+			double position =
+				mwindow->edl->get_cursor_position(cursor_x, pane->number);
+			gui->edit_menu->activate_menu(track, edit, pluginset, plugin, position);
+			mwindow->session->current_operation = NO_OPERATION;
+			result = 1;
+			break; }
+
+		case GROUP_TOGGLE: {
+			Edit *edit = mwindow->session->drag_edit;
+			if( edit ) {
+				if( shift_down() && edit->is_selected ) {
+					if( edit->group_id > 0 ) {
+						mwindow->edl->tracks->clear_selected_edits();
+						mwindow->edl->tracks->del_group(edit->group_id);
+					}
+					else {
+						int id = mwindow->session->group_number++;
+						mwindow->edl->tracks->new_group(id);
+					}
+					redraw = 0;
+				}
+				else {
+					if( mwindow->preferences->ctrl_toggle && !ctrl_down() )
+						mwindow->edl->tracks->clear_selected_edits();
+					edit->set_selected(-1);
+				}
+			}
+			mwindow->session->current_operation = NO_OPERATION;
+			update_overlay = 1;
+			result = 1;
+			drag_scroll = 0;
+			break; }
 
 		default:
-			if(mwindow->session->current_operation) {
+			if( mwindow->session->current_operation ) {
 //				if(mwindow->session->current_operation == SELECT_REGION) {
 //					mwindow->undo->update_undo_after(_("select"), LOAD_SESSION, 0, 0);
 //				}
 
 				mwindow->session->current_operation = NO_OPERATION;
 				drag_scroll = 0;
-// Traps button release events
-//				result = 1;
+				//result = 0;
+				break;
 			}
 			break;
 		}
@@ -4667,19 +4802,24 @@ int TrackCanvas::do_tracks(int cursor_x, int cursor_y, int button_press)
 {
 	int result = 0;
 
-	for(Track *track = mwindow->edl->tracks->first;
-		track && !result;
-		track = track->next) {
-		int64_t track_x, track_y, track_w, track_h;
-		track_dimensions(track, track_x, track_y, track_w, track_h);
-
-		if( button_press && get_buttonpress() == RIGHT_BUTTON &&
-		    cursor_y >= track_y && cursor_y < track_y + track_h) {
-			double pos = mwindow->edl->get_cursor_position(cursor_x, pane->number);
-			int64_t position = track->to_units(pos, 0);
-			gui->edit_menu->update(track, track->edits->editof(position, PLAY_FORWARD, 0));
-			gui->edit_menu->activate_menu();
+	Track *track=0;  Edit *edit=0;  PluginSet *pluginset=0;  Plugin *plugin=0;
+	drag_cursor_motion(cursor_x, cursor_y,
+		&track, &edit, &pluginset, &plugin);
+
+	if( button_press && track ) {
+		switch( get_buttonpress() ) {
+		case RIGHT_BUTTON: {
+			double position =
+				mwindow->edl->get_cursor_position(cursor_x, pane->number);
+			gui->track_menu->activate_menu(track, edit, pluginset, plugin, position);
+			mwindow->session->current_operation = NO_OPERATION;
 			result = 1;
+			break; }
+		case MIDDLE_BUTTON:
+			set_cursor(GRABBED_CURSOR, 0, 1);
+			mwindow->session->current_operation = DROP_TARGETING;
+			result = 1;
+			break;
 		}
 	}
 
@@ -4700,61 +4840,68 @@ int TrackCanvas::do_edits(int cursor_x, int cursor_y, int button_press, int drag
 // Cursor inside an edit
 			if(cursor_x >= edit_x && cursor_x < edit_x + edit_w &&
 				cursor_y >= edit_y && cursor_y < edit_y + edit_h) {
+				if( button_press && get_buttonpress() == LEFT_BUTTON ) {
+					if( get_double_click() ) {
+						mwindow->edl->tracks->clear_selected_edits();
+						double start = edit->track->from_units(edit->startproject);
+						start =	mwindow->edl->align_to_frame(start, 0);
+						mwindow->edl->local_session->set_selectionstart(start);
+						if( ctrl_down() ) {
 // Select duration of edit
-				if(button_press) {
-					if(get_double_click() && !drag_start) {
-						mwindow->edl->local_session->set_selectionstart(edit->track->from_units(edit->startproject));
-						mwindow->edl->local_session->set_selectionend(edit->track->from_units(edit->startproject) +
-							edit->track->from_units(edit->length));
-						if(mwindow->edl->session->cursor_on_frames)
-						{
-							mwindow->edl->local_session->set_selectionstart(
-								mwindow->edl->align_to_frame(mwindow->edl->local_session->get_selectionstart(1), 0));
-							mwindow->edl->local_session->set_selectionend(
-								mwindow->edl->align_to_frame(mwindow->edl->local_session->get_selectionend(1), 1));
+							double end = edit->track->from_units(edit->startproject+edit->length);
+							end = mwindow->edl->align_to_frame(end, 0);
+							mwindow->edl->local_session->set_selectionend(end);
+							mwindow->edl->tracks->select_affected_edits(
+								edit->track->from_units(edit->startproject),
+								edit->track, 1);
+						}
+						else {
+							mwindow->edl->local_session->set_selectionend(start);
+							edit->set_selected(1);
 						}
-						redraw = 1;
+						result = 1;
+					}
+					else if( mwindow->edl->session->editing_mode == EDITING_ARROW ) {
+						mwindow->session->drag_edit = edit;
+						mwindow->session->current_operation = GROUP_TOGGLE;
+						result = 1;
+					}
+					if( result ) {
 						rerender = 1;
 						update_cursor = -1;
-						result = 1;
 					}
 				}
-				else if(drag_start && track->record) {
-					if(mwindow->edl->session->editing_mode == EDITING_ARROW) {
-// Need to create drag window
+				else if( drag_start && track->record ) {
+					mwindow->session->drag_edit = edit;
+					mwindow->session->drag_origin_x = cursor_x;
+					mwindow->session->drag_origin_y = cursor_y;
+// Where the drag started, so we know relative position inside the edit later
+					mwindow->session->drag_position =
+						mwindow->edl->get_cursor_position(cursor_x, pane->number);
+					if( ctrl_down() ) {
 						mwindow->session->current_operation = DRAG_EDIT;
-						mwindow->session->drag_edit = edit;
-//printf("TrackCanvas::do_edits 2\n");
-
-// Drag only one edit if ctrl is initially down
-						if(ctrl_down()) {
-							mwindow->session->drag_edits->remove_all();
-							mwindow->session->drag_edits->append(edit);
-						}
-						else {
 // Construct list of all affected edits
-							mwindow->edl->tracks->get_affected_edits(
-								mwindow->session->drag_edits,
-								edit->track->from_units(edit->startproject),
-								edit->track);
-						}
-						mwindow->session->drag_origin_x = cursor_x;
-						mwindow->session->drag_origin_y = cursor_y;
-						// Where the drag started, so we know relative position inside the edit later
-						mwindow->session->drag_position = (double)cursor_x *
-							mwindow->edl->local_session->zoom_sample /
-							mwindow->edl->session->sample_rate +
-							(double)mwindow->edl->local_session->view_start[pane->number] *
-							mwindow->edl->local_session->zoom_sample /
-							mwindow->edl->session->sample_rate;
-
-						int cx, cy;
-						get_abs_cursor(cx, cy);
+						mwindow->edl->tracks->get_selected_edits(mwindow->session->drag_edits);
+// Need to create drag window
+						int cx, cy;  get_abs_cursor(cx, cy);
 						gui->drag_popup = new BC_DragWindow(gui,
 							mwindow->theme->get_image("clip_icon"), cx, cy);
-
-						result = 1;
 					}
+					else if( edit->is_selected ) {
+						if( mwindow->session->drag_group )
+							mwindow->session->drag_group->remove_user();
+						double start_position = 0;
+						mwindow->session->drag_group =
+							mwindow->selected_edits_to_clip(0, &start_position,
+								&mwindow->session->drag_group_first_track);
+						if( mwindow->session->drag_group ) {
+							mwindow->session->current_operation = DRAG_GROUP;
+							mwindow->session->drag_group_position = start_position;
+							mwindow->session->drag_group_edit = edit;
+							mwindow->session->drag_origin_y = edit_y;
+						}
+					}
+					result = 1;
 				}
 			}
 		}
@@ -4763,6 +4910,50 @@ int TrackCanvas::do_edits(int cursor_x, int cursor_y, int button_press, int drag
 }
 
 
+int TrackCanvas::test_track_group(EDL *group, Track *first_track, double &pos)
+{
+	Track *src = group->tracks->first;
+	for( Track *track=first_track; track && src; track=track->next ) {
+		if( !track->record ) continue;
+		if( src->data_type != track->data_type ) return 0;
+		for( Edit *src_edit=src->edits->first; src_edit; src_edit=src_edit->next ) {
+			if( src_edit->silence() ) continue;
+			if( edit_intersects(track, src_edit, pos) ) return 0;
+		}
+		src = src->next;
+	}
+	return !src ? 1 : 0;
+}
+
+int TrackCanvas::edit_intersects(Track *track, Edit *src_edit, double &pos)
+{
+	if( pos < 0 ) { pos = 0;  return 1; }
+	int64_t src_start = src_edit->startproject;
+	int64_t src_end = src_start + src_edit->length;
+	double new_start = src_edit->track->from_units(src_start) + pos;
+	double new_end = src_edit->track->from_units(src_end) + pos;
+	int64_t trk_start = track->to_units(new_start, 0);
+	int64_t trk_end = track->to_units(new_end, 0);
+	for( Edit *edit=track->edits->first; edit; edit=edit->next ) {
+		if( edit->is_selected || edit->silence() ) continue;
+		int64_t edit_start = edit->startproject;
+		if( edit_start >= trk_end ) continue;
+		int64_t edit_end = edit_start + edit->length;
+		if( trk_start >= edit_end ) continue;
+		int lt_dist = abs(trk_end - edit_start);
+		int rt_dist = abs(edit_end - trk_start);
+		if( lt_dist < rt_dist ) {
+			pos = edit->track->from_units(edit_start) -
+				src_edit->track->from_units(src_end);
+		}
+		else {
+			pos = edit->track->from_units(edit_end);
+		}
+		return 1;
+	}
+	return 0;
+}
+
 int TrackCanvas::test_resources(int cursor_x, int cursor_y)
 {
 	return 0;
@@ -4804,7 +4995,7 @@ int TrackCanvas::do_plugins(int cursor_x, int cursor_y, int drag_start,
 	if(plugin) {
 // Start plugin popup
 		if(button_press) {
-			if(get_buttonpress() == 3) {
+			if(get_buttonpress() == RIGHT_BUTTON ) {
 				gui->plugin_menu->update(plugin);
 				gui->plugin_menu->activate_menu();
 				result = 1;
@@ -4912,7 +5103,7 @@ int TrackCanvas::do_transitions(int cursor_x, int cursor_y,
 		if(!button_press) {
 			new_cursor = UPRIGHT_ARROW_CURSOR;
 		}
-		else if(get_buttonpress() == 3) {
+		else if(get_buttonpress() == RIGHT_BUTTON ) {
 			gui->transition_menu->update(transition);
 			gui->transition_menu->activate_menu();
 		}
@@ -4997,7 +5188,7 @@ int TrackCanvas::button_press_event()
 					update_cursor) ) break;
 
 				if( do_edits(cursor_x, cursor_y, 1, 0,
-					update_cursor, rerender, new_cursor,
+					update_overlay, rerender, new_cursor,
 					update_cursor) ) break;
 
 				if( do_plugins(cursor_x, cursor_y, 0, 1,
@@ -5060,6 +5251,7 @@ int TrackCanvas::button_press_event()
 		if( update_cursor < 0 ) {
 // double_click edit
 			gui->swindow->update_selection();
+			gui->draw_canvas(0, 0);
 		}
 		if( update_cursor ) {
 			gui->update_timebar(0);