X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fcpanel.C;h=87e753cd04e390b79c3f13ce9d37a6515d1b777c;hb=HEAD;hp=09c54b5ac34b2e90e46d508ddf07c2f7988cbe7b;hpb=ed1cab1d6cbde6129bbd09b9609f7bba03ab610f;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/cpanel.C b/cinelerra-5.1/cinelerra/cpanel.C
index 09c54b5a..87e753cd 100644
--- a/cinelerra-5.1/cinelerra/cpanel.C
+++ b/cinelerra-5.1/cinelerra/cpanel.C
@@ -79,14 +79,15 @@ 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;
-	subwindow->add_subwindow(cpanel_zoom = new CPanelZoom(mwindow, this, x, y+15, h-y-15));
+	x += (w - BC_Slider::get_span(1)) / 2;  y += 15;
+	subwindow->add_subwindow(cpanel_zoom = new CPanelZoom(mwindow, this, x, y, h-y-20));
 }
 
-void CPanel::reposition_buttons(int x, int y)
+void CPanel::reposition_buttons(int x, int y, int h)
 {
 	this->x = x;
 	this->y = y;
+	this->h = h;
 
 	for(int i = 0; i < CPANEL_OPERATIONS; i++)
 	{
@@ -94,7 +95,10 @@ void CPanel::reposition_buttons(int x, int y)
 		y += operation[i]->get_h();
 	}
 	x += (w - BC_Slider::get_span(1)) / 2;
-	cpanel_zoom->reposition_window(x, y+15);
+	y += 15;
+	h = this->h - this->y;
+	cpanel_zoom->reposition_window(x, y, w, h-y-20);
+	cpanel_zoom->set_pointer_motion_range(h);
 }
 
 
@@ -145,7 +149,7 @@ CPanelProtect::CPanelProtect(MWindow *mwindow, CPanel *gui, int x, int y)
 {
 	this->mwindow = mwindow;
 	this->gui = gui;
-	set_tooltip(_("Protect video from changes"));
+	set_tooltip(_("Protect video from changes (F1)"));
 }
 CPanelProtect::~CPanelProtect()
 {
@@ -169,7 +173,7 @@ CPanelMask::CPanelMask(MWindow *mwindow, CPanel *gui, int x, int y)
 {
 	this->mwindow = mwindow;
 	this->gui = gui;
-	set_tooltip(_("Edit mask"));
+	set_tooltip(_("Edit mask (F3)"));
 }
 CPanelMask::~CPanelMask()
 {
@@ -191,7 +195,7 @@ CPanelRuler::CPanelRuler(MWindow *mwindow, CPanel *gui, int x, int y)
 {
 	this->mwindow = mwindow;
 	this->gui = gui;
-	set_tooltip(_("Ruler"));
+	set_tooltip(_("Ruler (F4)"));
 }
 CPanelRuler::~CPanelRuler()
 {
@@ -213,7 +217,7 @@ CPanelMagnify::CPanelMagnify(MWindow *mwindow, CPanel *gui, int x, int y)
 {
 	this->mwindow = mwindow;
 	this->gui = gui;
-	set_tooltip(_("Zoom view"));
+	set_tooltip(_("Zoom view (F2)"));
 }
 CPanelMagnify::~CPanelMagnify()
 {
@@ -233,7 +237,7 @@ CPanelCamera::CPanelCamera(MWindow *mwindow, CPanel *gui, int x, int y)
 {
 	this->mwindow = mwindow;
 	this->gui = gui;
-	set_tooltip(_("Adjust camera automation"));
+	set_tooltip(_("Adjust camera automation (F5)"));
 }
 CPanelCamera::~CPanelCamera()
 {
@@ -253,7 +257,7 @@ CPanelProj::CPanelProj(MWindow *mwindow, CPanel *gui, int x, int y)
 {
 	this->mwindow = mwindow;
 	this->gui = gui;
-	set_tooltip(_("Adjust projector automation"));
+	set_tooltip(_("Adjust projector automation (F6)"));
 }
 CPanelProj::~CPanelProj()
 {
@@ -273,7 +277,7 @@ CPanelCrop::CPanelCrop(MWindow *mwindow, CPanel *gui, int x, int y)
 {
 	this->mwindow = mwindow;
 	this->gui = gui;
-	set_tooltip(_("Crop a layer or output"));
+	set_tooltip(_("Crop a layer or output (F7)"));
 }
 
 CPanelCrop::~CPanelCrop()
@@ -297,7 +301,7 @@ CPanelEyedrop::CPanelEyedrop(MWindow *mwindow, CPanel *gui, int x, int y)
 {
 	this->mwindow = mwindow;
 	this->gui = gui;
-	set_tooltip(_("Get color"));
+	set_tooltip(_("Get color (F8)"));
 }
 
 CPanelEyedrop::~CPanelEyedrop()
@@ -321,7 +325,7 @@ CPanelToolWindow::CPanelToolWindow(MWindow *mwindow, CPanel *gui, int x, int y)
 {
 	this->mwindow = mwindow;
 	this->gui = gui;
-	set_tooltip(_("Show tool info"));
+	set_tooltip(_("Show tool info (F9)"));
 }
 
 CPanelToolWindow::~CPanelToolWindow()
@@ -352,7 +356,7 @@ CPanelTitleSafe::CPanelTitleSafe(MWindow *mwindow, CPanel *gui, int x, int y)
 {
 	this->mwindow = mwindow;
 	this->gui = gui;
-	set_tooltip(_("Show safe regions"));
+	set_tooltip(_("Show safe regions (F10)"));
 }
 CPanelTitleSafe::~CPanelTitleSafe()
 {
@@ -365,7 +369,7 @@ int CPanelTitleSafe::handle_event()
 }
 
 CPanelZoom::CPanelZoom(MWindow *mwindow, CPanel *gui, int x, int y, int h)
- : BC_FSlider(x, y, 1, h-30, h, -2., 2., 0, 0)
+ : BC_FSlider(x, y, 1, h, h, -2., 2., 0, 0)
 {
 	this->mwindow = mwindow;
 	this->gui = gui;
@@ -384,7 +388,7 @@ int CPanelZoom::handle_event()
 	double zoom = pow(10.,value);
 	switch( mwindow->edl->session->cwindow_operation ) {
 	case CWINDOW_ZOOM:
-		gui->subwindow->zoom_canvas(0, zoom, 1);
+		gui->subwindow->zoom_canvas(zoom, 1);
 		break;
 	case CWINDOW_CAMERA:
 		aidx = AUTOMATION_CAMERA_Z;
@@ -411,12 +415,11 @@ int CPanelZoom::handle_event()
 int CPanelZoom::set_shown(int shown)
 {
 	if( shown ) {
-		float zoom = gui->subwindow->canvas->get_zoom();
-		gui->subwindow->zoom_canvas(0, zoom, 1);
-		show_window();
+		show();
+		update(gui->subwindow->canvas->get_zoom());
 	}
 	else
-		hide_window();
+		hide();
 	return 1;
 }
 
@@ -434,7 +437,7 @@ void CPanelZoom::update(float zoom)
 {
 	if( !is_hidden() ) {
 		if( zoom < 0.01 ) zoom = 0.01;
-		float value = log(zoom) / log(10.);
+		float value = log10f(zoom);
  		BC_FSlider::update(value);
 	}
 }