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=92505781fac1330d60857aaf3f4afb50d77efc45;hb=7e5a0760f40ff787cc3d93cb7768a901ebe52809;hpb=a95193c3fd88733d184f2d460eca1fe6ddf8af28

diff --git a/cinelerra-5.1/cinelerra/vwindowgui.C b/cinelerra-5.1/cinelerra/vwindowgui.C
index 92505781..dfbffff0 100644
--- a/cinelerra-5.1/cinelerra/vwindowgui.C
+++ b/cinelerra-5.1/cinelerra/vwindowgui.C
@@ -471,10 +471,10 @@ int VWindowGUI::drag_stop()
 		unlock_window();
 
 		Indexable *indexable =
-			mwindow->session->drag_clips->size() > 0 ?
-				(Indexable *)mwindow->session->drag_clips->get(0) :
 			mwindow->session->drag_assets->size() > 0 ?
-				(Indexable *)mwindow->session->drag_assets->get(0) : 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);
 
@@ -598,7 +598,7 @@ void VWindowEditing::toggle_label()
 	}
 }
 
-void VWindowEditing::prev_label()
+void VWindowEditing::prev_label(int cut)
 {
 	if(vwindow->get_edl())
 	{
@@ -628,7 +628,7 @@ void VWindowEditing::prev_label()
 	}
 }
 
-void VWindowEditing::next_label()
+void VWindowEditing::next_label(int cut)
 {
 	if(vwindow->get_edl())
 	{
@@ -830,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,
@@ -857,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 )