X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fzoombar.C;h=b6fd85214a3b625202e82413410133c4a48e9467;hp=79ecfd9cdf7da2bd319f77e06c9c3b93e22c954d;hb=05a3780d6edd6a792f0dde46ed69e4b740af5a51;hpb=a64e7d16c44bba0d137936227fc55871bb26c903

diff --git a/cinelerra-5.1/cinelerra/zoombar.C b/cinelerra-5.1/cinelerra/zoombar.C
index 79ecfd9c..b6fd8521 100644
--- a/cinelerra-5.1/cinelerra/zoombar.C
+++ b/cinelerra-5.1/cinelerra/zoombar.C
@@ -186,7 +186,7 @@ void ZoomBar::update_autozoom(int color)
 	}
 	auto_zoom_text->update(string);
 	const char *group_name = AutoTypeMenu::to_text(autogroup_type);
-	auto_type->set_text(group_name, color);
+	auto_type->set_text(group_name);
 }
 
 
@@ -440,7 +440,8 @@ int AutoZoom::handle_down_event()
 
 
 AutoTypeMenu::AutoTypeMenu(MWindow *mwindow, ZoomBar *zoombar, int x, int y, int wid)
-	: BC_PopupMenu(x, y, wid, to_text(mwindow->edl->local_session->zoombar_showautotype), 1)
+ : BC_PopupMenu(x, y, wid + 24,
+	to_text(mwindow->edl->local_session->zoombar_showautotype), 1, 0, 12)
 {
 	this->mwindow = mwindow;
 	this->zoombar = zoombar;
@@ -481,6 +482,20 @@ int AutoTypeMenu::from_text(char *text)
 	return AUTOGROUPTYPE_INT255;
 }
 
+int AutoTypeMenu::draw_face(int dx, int color)
+{
+	BC_PopupMenu::draw_face(dx+8, color);
+	color = mwindow->edl->local_session->zoombar_showautocolor;
+	if( color >= 0 ) {
+		set_color(color);
+		int margin = get_margin();
+		int mx = margin+4, my = 3*margin/8;
+		int bh = get_h() - 2*my;
+		draw_box(mx,my, bh,bh);
+	}
+	return 1;
+}
+
 int AutoTypeMenu::handle_event()
 {
 	mwindow->edl->local_session->zoombar_showautotype = from_text(this->get_text());