X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fzoompanel.C;h=5e9dcd5bd32b239294792ff13c5eebd0b2432535;hp=1c08f7f1837d7c56f94de25b5978d50dca245015;hb=c9c0e07706fad701a70ee0d1ffb0fcb6304f138c;hpb=fbdd13b462256ed4f3b35dc114385fe0b0de0dcd diff --git a/cinelerra-5.1/cinelerra/zoompanel.C b/cinelerra-5.1/cinelerra/zoompanel.C index 1c08f7f1..5e9dcd5b 100644 --- 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);