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=e826e30bd837e7f8f39d9ea869292a56ae9deb8b;hb=54b918a8b84f666bf32548ebd12b93908061d2a6;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1

diff --git a/cinelerra-5.1/cinelerra/zoompanel.C b/cinelerra-5.1/cinelerra/zoompanel.C
index e826e30b..5e9dcd5b 100644
--- a/cinelerra-5.1/cinelerra/zoompanel.C
+++ b/cinelerra-5.1/cinelerra/zoompanel.C
@@ -106,7 +106,7 @@ void ZoomPanel::calculate_menu()
 
 int ZoomPanel::calculate_w(int menu_w)
 {
-	return BC_PopupMenu::calculate_w(menu_w) + BC_Tumbler::calculate_w();
+	return BC_PopupMenu::calculate_w(-1, menu_w, 1) + BC_Tumbler::calculate_w();
 }
 
 void ZoomPanel::update_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);
@@ -267,7 +268,7 @@ double ZoomPanel::text_to_zoom(char *text, int use_table)
 
 ZoomPopup::ZoomPopup(MWindow *mwindow, ZoomPanel *panel, int x, int y)
  : BC_PopupMenu(x, y, panel->w, panel->value_to_text(panel->value, 0),
-	1, mwindow->theme->get_image_set("zoombar_menu", 0))
+	1, mwindow->theme->get_image_set("zoombar_menu", 0), 0)
 {
 	this->mwindow = mwindow;
 	this->panel = panel;