}
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);
}
SampleZoomPanel::SampleZoomPanel(MWindow *mwindow, ZoomBar *zoombar, int x, int y)
: ZoomPanel(mwindow, zoombar, mwindow->edl->local_session->zoom_sample,
- x, y, 110, MIN_ZOOM_TIME, MAX_ZOOM_TIME, ZOOM_TIME)
+ x, y, 130, MIN_ZOOM_TIME, MAX_ZOOM_TIME, ZOOM_TIME)
{
this->mwindow = mwindow;
this->zoombar = zoombar;
AmpZoomPanel::AmpZoomPanel(MWindow *mwindow, ZoomBar *zoombar, int x, int y)
: ZoomPanel(mwindow, zoombar, mwindow->edl->local_session->zoom_y,
- x, y, 80, MIN_AMP_ZOOM, MAX_AMP_ZOOM, ZOOM_LONG)
+ x, y, 100, MIN_AMP_ZOOM, MAX_AMP_ZOOM, ZOOM_LONG)
{
this->mwindow = mwindow;
this->zoombar = zoombar;
TrackZoomPanel::TrackZoomPanel(MWindow *mwindow, ZoomBar *zoombar, int x, int y)
: ZoomPanel(mwindow, zoombar, mwindow->edl->local_session->zoom_track,
- x, y, 70, MIN_TRACK_ZOOM, MAX_TRACK_ZOOM, ZOOM_LONG)
+ x, y, 90, MIN_TRACK_ZOOM, MAX_TRACK_ZOOM, ZOOM_LONG)
{
this->mwindow = mwindow;
this->zoombar = zoombar;
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;
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+8, 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());