X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcpanel.C;h=1f82e046e9d1e495613b2bf74aa218188ba21bf3;hb=9182a6f3c48a4d211b7e3527e08511bd531011c4;hp=87e753cd04e390b79c3f13ce9d37a6515d1b777c;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/cpanel.C b/cinelerra-5.1/cinelerra/cpanel.C
index 87e753cd..1f82e046 100644
--- a/cinelerra-5.1/cinelerra/cpanel.C
+++ b/cinelerra-5.1/cinelerra/cpanel.C
@@ -79,8 +79,8 @@ void CPanel::create_objects()
 	y += operation[CWINDOW_TOOL_WINDOW]->get_h();
 	subwindow->add_subwindow(operation[CWINDOW_TITLESAFE] = new CPanelTitleSafe(mwindow, this, x, y));
 	y += operation[CWINDOW_TITLESAFE]->get_h();
-	x += (w - BC_Slider::get_span(1)) / 2;  y += 15;
-	subwindow->add_subwindow(cpanel_zoom = new CPanelZoom(mwindow, this, x, y, h-y-20));
+	x += (w - BC_Slider::get_span(1)) / 2;  y += yS(15);
+	subwindow->add_subwindow(cpanel_zoom = new CPanelZoom(mwindow, this, x, y, h-y-yS(20)));
 }
 
 void CPanel::reposition_buttons(int x, int y, int h)
@@ -95,9 +95,9 @@ void CPanel::reposition_buttons(int x, int y, int h)
 		y += operation[i]->get_h();
 	}
 	x += (w - BC_Slider::get_span(1)) / 2;
-	y += 15;
+	y += yS(15);
 	h = this->h - this->y;
-	cpanel_zoom->reposition_window(x, y, w, h-y-20);
+	cpanel_zoom->reposition_window(x, y, w, h-y-yS(20));
 	cpanel_zoom->set_pointer_motion_range(h);
 }
 
@@ -132,6 +132,7 @@ void CPanel::set_operation(int value)
 	    operation[CWINDOW_CAMERA]->get_value() ||
 	    operation[CWINDOW_PROJECTOR]->get_value() ) {
 		cpanel_zoom->set_shown(1);
+		subwindow->update_canvas(0);
 	}
 	else
 		cpanel_zoom->set_shown(0);
@@ -150,6 +151,8 @@ CPanelProtect::CPanelProtect(MWindow *mwindow, CPanel *gui, int x, int y)
 	this->mwindow = mwindow;
 	this->gui = gui;
 	set_tooltip(_("Protect video from changes (F1)"));
+// *** CONTEXT_HELP ***
+	context_help_set_keyword("Compositor Toolbar");
 }
 CPanelProtect::~CPanelProtect()
 {
@@ -174,6 +177,8 @@ CPanelMask::CPanelMask(MWindow *mwindow, CPanel *gui, int x, int y)
 	this->mwindow = mwindow;
 	this->gui = gui;
 	set_tooltip(_("Edit mask (F3)"));
+// *** CONTEXT_HELP ***
+	context_help_set_keyword("Masks");
 }
 CPanelMask::~CPanelMask()
 {
@@ -196,6 +201,8 @@ CPanelRuler::CPanelRuler(MWindow *mwindow, CPanel *gui, int x, int y)
 	this->mwindow = mwindow;
 	this->gui = gui;
 	set_tooltip(_("Ruler (F4)"));
+// *** CONTEXT_HELP ***
+	context_help_set_keyword("Compositor Toolbar");
 }
 CPanelRuler::~CPanelRuler()
 {
@@ -218,6 +225,8 @@ CPanelMagnify::CPanelMagnify(MWindow *mwindow, CPanel *gui, int x, int y)
 	this->mwindow = mwindow;
 	this->gui = gui;
 	set_tooltip(_("Zoom view (F2)"));
+// *** CONTEXT_HELP ***
+	context_help_set_keyword("Compositor Toolbar");
 }
 CPanelMagnify::~CPanelMagnify()
 {
@@ -238,6 +247,8 @@ CPanelCamera::CPanelCamera(MWindow *mwindow, CPanel *gui, int x, int y)
 	this->mwindow = mwindow;
 	this->gui = gui;
 	set_tooltip(_("Adjust camera automation (F5)"));
+// *** CONTEXT_HELP ***
+	context_help_set_keyword("Camera and Projector");
 }
 CPanelCamera::~CPanelCamera()
 {
@@ -258,6 +269,8 @@ CPanelProj::CPanelProj(MWindow *mwindow, CPanel *gui, int x, int y)
 	this->mwindow = mwindow;
 	this->gui = gui;
 	set_tooltip(_("Adjust projector automation (F6)"));
+// *** CONTEXT_HELP ***
+	context_help_set_keyword("Camera and Projector");
 }
 CPanelProj::~CPanelProj()
 {
@@ -278,6 +291,8 @@ CPanelCrop::CPanelCrop(MWindow *mwindow, CPanel *gui, int x, int y)
 	this->mwindow = mwindow;
 	this->gui = gui;
 	set_tooltip(_("Crop a layer or output (F7)"));
+// *** CONTEXT_HELP ***
+	context_help_set_keyword("Cropping");
 }
 
 CPanelCrop::~CPanelCrop()
@@ -302,6 +317,8 @@ CPanelEyedrop::CPanelEyedrop(MWindow *mwindow, CPanel *gui, int x, int y)
 	this->mwindow = mwindow;
 	this->gui = gui;
 	set_tooltip(_("Get color (F8)"));
+// *** CONTEXT_HELP ***
+	context_help_set_keyword("Compositor Toolbar");
 }
 
 CPanelEyedrop::~CPanelEyedrop()
@@ -326,6 +343,8 @@ CPanelToolWindow::CPanelToolWindow(MWindow *mwindow, CPanel *gui, int x, int y)
 	this->mwindow = mwindow;
 	this->gui = gui;
 	set_tooltip(_("Show tool info (F9)"));
+// *** CONTEXT_HELP ***
+	context_help_set_keyword("Compositor Toolbar");
 }
 
 CPanelToolWindow::~CPanelToolWindow()
@@ -357,6 +376,8 @@ CPanelTitleSafe::CPanelTitleSafe(MWindow *mwindow, CPanel *gui, int x, int y)
 	this->mwindow = mwindow;
 	this->gui = gui;
 	set_tooltip(_("Show safe regions (F10)"));
+// *** CONTEXT_HELP ***
+	context_help_set_keyword("Compositor Toolbar");
 }
 CPanelTitleSafe::~CPanelTitleSafe()
 {
@@ -364,8 +385,7 @@ CPanelTitleSafe::~CPanelTitleSafe()
 int CPanelTitleSafe::handle_event()
 {
 	mwindow->edl->session->safe_regions = get_value();
-	gui->subwindow->canvas->draw_refresh();
-	return 1;
+	return gui->subwindow->canvas->refresh(1);
 }
 
 CPanelZoom::CPanelZoom(MWindow *mwindow, CPanel *gui, int x, int y, int h)
@@ -388,7 +408,8 @@ int CPanelZoom::handle_event()
 	double zoom = pow(10.,value);
 	switch( mwindow->edl->session->cwindow_operation ) {
 	case CWINDOW_ZOOM:
-		gui->subwindow->zoom_canvas(zoom, 1);
+		gui->subwindow->canvas->set_zoom(mwindow->edl, zoom);
+		gui->subwindow->update_canvas();
 		break;
 	case CWINDOW_CAMERA:
 		aidx = AUTOMATION_CAMERA_Z;
@@ -404,11 +425,7 @@ int CPanelZoom::handle_event()
 			track->automation->autos[aidx], 1);
 	if( !z_auto ) return 1;
 	z_auto->set_value(zoom);
-	gui->subwindow->update_tool();
-	mwindow->gui->lock_window("CPanelZoom::handle_event 1");
-	mwindow->gui->draw_overlays(1);
-	mwindow->gui->unlock_window();
-	mwindow->sync_parameters(CHANGE_PARAMS);
+	gui->subwindow->sync_parameters(CHANGE_PARAMS, 1, 1);
 	return 1;
 }