X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fvwindowgui.C;h=1fb4ca21d64bafb76ed674f1d15659274ee7dbdc;hp=7c1d51e0a0df80a702a4fd34d5cc526055f4eed1;hb=04293346a5ef49683cfa6ca3a98ef6cbfcdf7732;hpb=b78b166faf60a1c7357f990b1e2fb0e70be29fee diff --git a/cinelerra-5.1/cinelerra/vwindowgui.C b/cinelerra-5.1/cinelerra/vwindowgui.C index 7c1d51e0..1fb4ca21 100644 --- a/cinelerra-5.1/cinelerra/vwindowgui.C +++ b/cinelerra-5.1/cinelerra/vwindowgui.C @@ -363,11 +363,12 @@ int VWindowGUI::keypress_event() case 'Z': mwindow->redo_entry(this); break; - case 'f': - canvas->set_fullscreen(canvas->get_fullscreen() ? 0 : 1); - break; + case 'f': { + int on = canvas->get_fullscreen() ? 0 : 1; + canvas->set_fullscreen(on, 1); + break; } case ESC: - canvas->set_fullscreen(0); + canvas->set_fullscreen(0, 1); break; case KEY_F1: case KEY_F2: @@ -823,14 +824,14 @@ void VWindowCanvas::close_source() void VWindowCanvas::draw_refresh(int flush) { - EDL *edl = gui->vwindow->get_edl(); - if( !get_canvas()->get_video_on() ) { int cw = get_canvas()->get_w(), ch = get_canvas()->get_h(); get_canvas()->clear_box(0, 0, cw, ch); - int ow = edl ? get_output_w(edl) : 0; - int oh = edl ? get_output_h(edl) : 0; - if( ow > 0 && oh > 0 && refresh_frame ) { + } + EDL *edl = gui->vwindow->get_edl(); + if( refresh_frame && edl ) { + int ow = get_output_w(edl), oh = get_output_h(edl); + if( ow > 0 && oh > 0 ) { float in_x1, in_y1, in_x2, in_y2; float out_x1, out_y1, out_x2, out_y2; get_transfers(edl, @@ -850,6 +851,8 @@ void VWindowCanvas::draw_refresh(int flush) (int)(in_x2 - in_x1), (int)(in_y2 - in_y1), 0); } + } + if( !get_canvas()->get_video_on() ) { draw_overlays(); get_canvas()->flash(flush); }