X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fvwindowgui.C;h=dfbffff0b7bbc1ae580304d6ff62e775298e793b;hp=e3f323c526e08acd98c56b05b5e682376a317e89;hb=7e5a0760f40ff787cc3d93cb7768a901ebe52809;hpb=b9f98da8f1cd8b7b31ead02fa41f299b56cac3da

diff --git a/cinelerra-5.1/cinelerra/vwindowgui.C b/cinelerra-5.1/cinelerra/vwindowgui.C
index e3f323c5..dfbffff0 100644
--- a/cinelerra-5.1/cinelerra/vwindowgui.C
+++ b/cinelerra-5.1/cinelerra/vwindowgui.C
@@ -462,26 +462,22 @@ void VWindowGUI::drag_motion()
 
 int VWindowGUI::drag_stop()
 {
-	if(get_hidden()) return 0;
+	if( get_hidden() ) return 0;
 
-	if(highlighted &&
-		mwindow->session->current_operation == DRAG_ASSET)
-	{
+	if( highlighted &&
+	    mwindow->session->current_operation == DRAG_ASSET ) {
 		highlighted = 0;
 		canvas->draw_refresh();
 		unlock_window();
 
-		Indexable *indexable = mwindow->session->drag_assets->size() ?
-			mwindow->session->drag_assets->get(0) :
-			0;
-		EDL *edl = mwindow->session->drag_clips->size() ?
-			mwindow->session->drag_clips->get(0) :
-			0;
-		if(indexable)
+		Indexable *indexable =
+			mwindow->session->drag_assets->size() > 0 ?
+				(Indexable *)mwindow->session->drag_assets->get(0) :
+			mwindow->session->drag_clips->size() > 0 ?
+				(Indexable *)mwindow->session->drag_clips->get(0) : 0;
+		if( indexable )
 			vwindow->change_source(indexable);
-		else
-		if(edl)
-			vwindow->change_source(edl);
+
 		lock_window("VWindowGUI::drag_stop");
 		return 1;
 	}
@@ -602,7 +598,7 @@ void VWindowEditing::toggle_label()
 	}
 }
 
-void VWindowEditing::prev_label()
+void VWindowEditing::prev_label(int cut)
 {
 	if(vwindow->get_edl())
 	{
@@ -632,7 +628,7 @@ void VWindowEditing::prev_label()
 	}
 }
 
-void VWindowEditing::next_label()
+void VWindowEditing::next_label(int cut)
 {
 	if(vwindow->get_edl())
 	{
@@ -834,14 +830,17 @@ void VWindowCanvas::draw_refresh(int flush)
 		float in_x1, in_y1, in_x2, in_y2;
 		float out_x1, out_y1, out_x2, out_y2;
 		get_transfers(edl,
-			in_x1,
-			in_y1,
-			in_x2,
-			in_y2,
-			out_x1,
-			out_y1,
-			out_x2,
-			out_y2);
+			in_x1, in_y1, in_x2, in_y2,
+			out_x1, out_y1, out_x2, out_y2);
+// input scaled from session to refresh frame coordinates
+		int ow = get_output_w(edl);
+		int oh = get_output_h(edl);
+		int rw = refresh_frame->get_w();
+		int rh = refresh_frame->get_h();
+		float xs = (float)rw / ow;
+		float ys = (float)rh / oh;
+		in_x1 *= xs;  in_x2 *= xs;
+		in_y1 *= ys;  in_y2 *= ys;
 		get_canvas()->draw_vframe(refresh_frame,
 				(int)out_x1,
 				(int)out_y1,
@@ -861,6 +860,12 @@ void VWindowCanvas::draw_refresh(int flush)
 	}
 }
 
+int VWindowCanvas::need_overlays()
+{
+	if( gui->highlighted ) return 1;
+	return 0;
+}
+
 void VWindowCanvas::draw_overlays()
 {
 	if( gui->highlighted )