version update

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / zoompanel.C

diff --git a/cinelerra-5.1/cinelerra/zoompanel.C b/cinelerra-5.1/cinelerra/zoompanel.C
index 1c08f7f1837d7c56f94de25b5978d50dca245015..b18186890db59650a8383c7b20d9a772db8a5196 100644 (file)
--- a/cinelerra-5.1/cinelerra/zoompanel.C
+++ b/cinelerra-5.1/cinelerra/zoompanel.C
@@ -120,7 +120,7 @@ void ZoomPanel::update_menu()
 void ZoomPanel::create_objects()
 {
        subwindow->add_subwindow(zoom_text = new ZoomPopup(mwindow, this, x, y));
-       x += zoom_text->get_w() - xS(3);
+       x += zoom_text->get_w();
        subwindow->add_subwindow(zoom_tumbler = new ZoomTumbler(mwindow, this, x, y));
        calculate_menu();
 }
@@ -244,7 +244,8 @@ double ZoomPanel::text_to_zoom(char *text, int use_table)
                                mwindow->edl->session->sample_rate,
                                mwindow->edl->session->time_format,
                                mwindow->edl->session->frame_rate,
-                               mwindow->edl->session->frames_per_foot);
+                               mwindow->edl->session->frames_per_foot,
+                               mwindow->get_timecode_offset());
                        total_samples /= mwindow->theme->mcanvas_w -
                                mwindow->theme->patchbay_w -
                                BC_ScrollBar::get_span(SCROLL_VERT);
@@ -271,6 +272,8 @@ ZoomPopup::ZoomPopup(MWindow *mwindow, ZoomPanel *panel, int x, int y)
 {
        this->mwindow = mwindow;
        this->panel = panel;
+// *** CONTEXT_HELP ***
+       context_help_set_keyword("Compositor Controls");
 }
 
 ZoomPopup::~ZoomPopup()
@@ -291,6 +294,8 @@ ZoomTumbler::ZoomTumbler(MWindow *mwindow, ZoomPanel *panel, int x, int y)
 {
        this->mwindow = mwindow;
        this->panel = panel;
+// *** CONTEXT_HELP ***
+       context_help_set_keyword("Compositor Controls");
 }
 
 ZoomTumbler::~ZoomTumbler()