version update, bld tweaks, resize track booby, 10fps for images

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

diff --git a/cinelerra-5.1/cinelerra/zoombar.C b/cinelerra-5.1/cinelerra/zoombar.C
index 38f18aeb4b5b8cde6b942f6b5d0ed6d19811ad54..6ed44a6d1d85d55ff85703c89b878b831e2c96e2 100644 (file)
--- a/cinelerra-5.1/cinelerra/zoombar.C
+++ b/cinelerra-5.1/cinelerra/zoombar.C
@@ -148,9 +148,22 @@ int ZoomBar::draw()
 }
 
 void ZoomBar::update_autozoom()
+{
+       update_autozoom(mwindow->edl->local_session->zoombar_showautocolor);
+}
+
+void ZoomBar::update_autozoom(int grouptype, int color)
+{
+       mwindow->edl->local_session->zoombar_showautotype = grouptype;
+       update_autozoom(color);
+}
+
+void ZoomBar::update_autozoom(int color)
 {
        char string[BCTEXTLEN];
        int autogroup_type = mwindow->edl->local_session->zoombar_showautotype;
+       mwindow->edl->local_session->zoombar_showautocolor = color;
+       if( color < 0 ) color = get_resources()->default_text_color;
        switch( autogroup_type ) {
        case AUTOGROUPTYPE_AUDIO_FADE:
        case AUTOGROUPTYPE_VIDEO_FADE:
@@ -176,6 +189,7 @@ void ZoomBar::update_autozoom()
        auto_type->set_text(group_name);
 }
 
+
 int ZoomBar::update()
 {
        sample_zoom->update(mwindow->edl->local_session->zoom_sample);
@@ -426,7 +440,7 @@ 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, to_text(mwindow->edl->local_session->zoombar_showautotype), 1)
 {
        this->mwindow = mwindow;
        this->zoombar = zoombar;
@@ -467,6 +481,20 @@ int AutoTypeMenu::from_text(char *text)
        return AUTOGROUPTYPE_INT255;
 }
 
+int AutoTypeMenu::draw_face(int dx)
+{
+       BC_PopupMenu::draw_face(dx);
+       int color = mwindow->edl->local_session->zoombar_showautocolor;
+       if( color >= 0 ) {
+               set_color(color);
+               int margin = get_margin();
+               int mx = margin+5, 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());