X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fcwindowgui.C;h=20eff1207d05532fca714077f2b5c8c4b049bf72;hb=55ccff122957ddfaa871cf8f251cfe866732c870;hp=9301f19dd184d39dc062dc99cfdbce65b576204b;hpb=4d2d052cc767103a8699b1de0e3a1f36844ac04f;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/cwindowgui.C b/cinelerra-5.1/cinelerra/cwindowgui.C
index 9301f19d..20eff120 100644
--- a/cinelerra-5.1/cinelerra/cwindowgui.C
+++ b/cinelerra-5.1/cinelerra/cwindowgui.C
@@ -92,23 +92,28 @@ CWindowGUI::CWindowGUI(MWindow *mwindow, CWindow *cwindow)
 	this->mwindow = mwindow;
 	this->cwindow = cwindow;
 	affected_track = 0;
-	affected_x = 0;
-	affected_y = 0;
-	affected_z = 0;
+	affected_x = affected_y = affected_z = 0;
 	mask_keyframe = 0;
 	orig_mask_keyframe = new MaskAuto(0, 0);
 	affected_point = 0;
-	x_offset = 0;
-	y_offset = 0;
-	x_origin = 0;
-	y_origin = 0;
+	x_offset = y_offset = 0;
+	x_origin = y_origin = 0;
 	current_operation = CWINDOW_NONE;
 	tool_panel = 0;
-	translating_zoom = 0;
 	active = 0;
 	inactive = 0;
-	crop_translate = 0;
+	crop_handle = -1; crop_translate = 0;
+	crop_origin_x = crop_origin_y = 0;
+	crop_origin_x1 = crop_origin_y1 = 0;
+	crop_origin_x2 = crop_origin_y2 = 0;
 	eyedrop_visible = 0;
+	eyedrop_x = eyedrop_y = 0;
+	ruler_origin_x = ruler_origin_y = 0;
+	ruler_handle = -1; ruler_translate = 0;
+	center_x = center_y = center_z = 0;
+	control_in_x = control_in_y = 0;
+	control_out_x = control_out_y = 0;
+	translating_zoom = 0;
 	highlighted = 0;
 }
 
@@ -381,7 +386,7 @@ void CWindowGUI::zoom_canvas(double value, int update_menu)
 		x = output_x - cx / zoom;
 		y = output_y - cy / zoom;
 	}
-	canvas->update_zoom((int)x, (int)y, zoom);
+	canvas->update_zoom((int)(x+0.5), (int)(y+0.5), zoom);
 
 	if( update_menu )
 		zoom_panel->update(value);
@@ -599,7 +604,7 @@ int CWindowGUI::drag_stop()
 		if(mwindow->session->drag_assets->total)
 		{
 			mwindow->gui->lock_window("CWindowGUI::drag_stop 1");
-			mwindow->clear(0);
+			mwindow->clear(0, 1);
 			mwindow->load_assets(mwindow->session->drag_assets,
 				mwindow->edl->local_session->get_selectionstart(),
 				LOADMODE_PASTE,
@@ -614,7 +619,7 @@ int CWindowGUI::drag_stop()
 		if(mwindow->session->drag_clips->total)
 		{
 			mwindow->gui->lock_window("CWindowGUI::drag_stop 2");
-			mwindow->clear(0);
+			mwindow->clear(0, 1);
 			mwindow->paste_edls(mwindow->session->drag_clips,
 				LOADMODE_PASTE,
 				mwindow->session->track_highlighted,
@@ -721,7 +726,7 @@ CWrapper(next_edit)
 
 void CWindowEditing::to_clip()
 {
-        mwindow->to_clip(_("composer window: "));
+        mwindow->to_clip(mwindow->edl, _("composer window: "));
 }
 
 
@@ -2162,15 +2167,24 @@ int CWindowCanvas::do_eyedrop(int &rerender, int button_press, int draw)
 	float blue = (float)*row++ / max; \
 	if(do_yuv) \
 	{ \
-		mwindow->edl->local_session->red += red + V_TO_R * (blue - 0.5); \
-		mwindow->edl->local_session->green += red + U_TO_G * (green - 0.5) + V_TO_G * (blue - 0.5); \
-		mwindow->edl->local_session->blue += red + U_TO_B * (green - 0.5); \
+		float r = red + V_TO_R * (blue - 0.5); \
+		float g = red + U_TO_G * (green - 0.5) + V_TO_G * (blue - 0.5); \
+		float b = red + U_TO_B * (green - 0.5); \
+		mwindow->edl->local_session->red += r; \
+		mwindow->edl->local_session->green += g; \
+		mwindow->edl->local_session->blue += b; \
+		if(r > mwindow->edl->local_session->red_max) mwindow->edl->local_session->red_max = r; \
+		if(g > mwindow->edl->local_session->green_max) mwindow->edl->local_session->green_max = g; \
+		if(b > mwindow->edl->local_session->blue_max) mwindow->edl->local_session->blue_max = b; \
 	} \
 	else \
 	{ \
 		mwindow->edl->local_session->red += red; \
 		mwindow->edl->local_session->green += green; \
 		mwindow->edl->local_session->blue += blue; \
+		if(red > mwindow->edl->local_session->red_max) mwindow->edl->local_session->red_max = red; \
+		if(green > mwindow->edl->local_session->green_max) mwindow->edl->local_session->green_max = green; \
+		if(blue > mwindow->edl->local_session->blue_max) mwindow->edl->local_session->blue_max = blue; \
 	} \
 }
 
@@ -2179,6 +2193,9 @@ int CWindowCanvas::do_eyedrop(int &rerender, int button_press, int draw)
 			mwindow->edl->local_session->red = 0;
 			mwindow->edl->local_session->green = 0;
 			mwindow->edl->local_session->blue = 0;
+			mwindow->edl->local_session->red_max = 0;
+			mwindow->edl->local_session->green_max = 0;
+			mwindow->edl->local_session->blue_max = 0;
 			for(int i = row1; i < row2; i++)
 			{
 				for(int j = column1; j < column2; j++)