X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ftrackcanvas.C;h=dd48141ab7d6c1c4af1d38a0629d3f79629041d1;hp=03fac258d3f459ccec30823b099ef1083c29ea29;hb=54cc56bff09f5004b2a6cd454375f06e56acf5a0;hpb=15b020d5c21b2cc5545227f7c092f06086666b4a

diff --git a/cinelerra-5.1/cinelerra/trackcanvas.C b/cinelerra-5.1/cinelerra/trackcanvas.C
index 03fac258..dd48141a 100644
--- a/cinelerra-5.1/cinelerra/trackcanvas.C
+++ b/cinelerra-5.1/cinelerra/trackcanvas.C
@@ -1943,8 +1943,12 @@ void TrackCanvas::draw_drag_handle()
 	if( !mwindow->session->drag_edit ) return;
 	int group_id = mwindow->session->drag_edit->group_id;
         if( !group_id ) return;
+	int64_t dx, dy, dw, dh;
+	edit_dimensions(mwindow->session->drag_edit, dx, dy, dw, dh);
 	int drag_handle = mwindow->session->drag_handle;
-	set_color(RED);
+	int64_t pixel0 = !drag_handle ? dx : dx + dw;
+	int delta = pixel1 - pixel0;
+	set_color(LTPURPLE);
 	set_line_width(3);
 
 	for( Track *track=mwindow->edl->tracks->first; track; track=track->next ) {
@@ -1975,10 +1979,10 @@ void TrackCanvas::draw_drag_handle()
 			can_drag = 0;
 		int64_t x, y, w, h;
 		edit_dimensions(edit, x, y, w, h);
+		if( y+h < 0 || y >= get_h() ) continue;
 		int edge_x = !drag_handle ? x : x + w;
 		int edge_y = y + h/2, k = 10;
-		if( edge_x >= 0 && edge_x < get_w() &&
-		    edge_y >= 0 && edge_y < get_h() ) {
+		if( edge_x >= 0 && edge_x < get_w() ) {
 			if( !can_drag ) {
 				draw_line(edge_x-k,edge_y-k, edge_x+k,edge_y+k);
 				draw_line(edge_x-k,edge_y+k, edge_x+k,edge_y-k);
@@ -1992,6 +1996,10 @@ void TrackCanvas::draw_drag_handle()
 				draw_line(edge_x,edge_y, edge_x-k,edge_y+k);
 			}
 		}
+		edge_x += delta;
+		if( edge_x >= 0 && edge_x < get_w() ) {
+			draw_line(edge_x, y, edge_x, y+h);
+		}
 	}
 	set_line_width(1);
 }
@@ -3800,18 +3808,28 @@ void TrackCanvas::update_drag_handle()
 		edl->create_objects();
 		edl->copy_all(mwindow->edl);
 		MainSession *session = mwindow->session;
-		int edit_mode = mwindow->edl->session->edit_handle_mode[session->drag_button];
+		int handle_mode = mwindow->edl->session->edit_handle_mode[session->drag_button];
 		edl->modify_edithandles(session->drag_start,
-			session->drag_position,
-			session->drag_handle,
-			edit_mode,
+			session->drag_position, session->drag_handle, handle_mode,
 			edl->session->labels_follow_edits,
 			edl->session->plugins_follow_edits,
 			edl->session->autos_follow_edits,
-			session->drag_edit->group_id);
-		double position = edit_mode != MOVE_NO_EDITS &&
-			( session->drag_handle || edit_mode == MOVE_ONE_EDIT ) ?
-				session->drag_position : session->drag_start;
+			!session->drag_edit ? 0 : session->drag_edit->group_id);
+
+		double position = -1;
+		switch( handle_mode ) {
+		case MOVE_RIPPLE:
+		case MOVE_ROLL:
+		case MOVE_SLIDE:
+			position = session->drag_position;
+			break;
+		case MOVE_SLIP:
+		case MOVE_EDGE:
+			position = session->drag_start;
+			break;
+		}
+
+		if( position < 0 ) position = 0;
 		Track *track = session->drag_handle_track();
 		int64_t pos = track->to_units(position, 0);
 		render_handle_frame(edl, pos, shift_down() ? 0 :