int ZWindowGUI::close_event()
{
- set_done(0);
+ set_done(1);
return 1;
}
close_event();
return 1;
}
- unlock_window();
int result = 1;
switch( key ) {
- case 'f':
- if( canvas->get_fullscreen() )
- canvas->stop_fullscreen();
- else
- canvas->start_fullscreen();
- break;
+ case 'f': {
+ int on = canvas->get_fullscreen() ? 0 : 1;
+ canvas->set_fullscreen(on, 1);
+ break; }
case ESC:
- if( canvas->get_fullscreen() )
- canvas->stop_fullscreen();
+ canvas->set_fullscreen(0, 1);
break;
default:
+ unlock_window();
mwindow->gui->lock_window("ZWindowGUI::keypress_event");
result = mwindow->gui->mbuttons->transport->do_keypress(key);
mwindow->gui->unlock_window();
+ lock_window("ZWindowGUI::keypress_event 1");
}
- lock_window("ZWindowGUI::keypress_event 1");
return result;
}
cvs->flash(flush);
}
+float ZWindowCanvas::get_auto_zoom()
+{
+ EDL *edl = gui->zwindow->edl;
+ if( !edl ) edl = mwindow->edl;
+ float conformed_w, conformed_h;
+ edl->calculate_conformed_dimensions(0, conformed_w, conformed_h);
+ BC_WindowBase *window = get_canvas();
+ int cw = window ? window->get_w() : w;
+ int ch = window ? window->get_h() : h;
+ float zoom_x = cw / conformed_w;
+ float zoom_y = ch / conformed_h;
+ return zoom_x < zoom_y ? zoom_x : zoom_y;
+}
+