X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcwindowgui.C;fp=cinelerra-5.1%2Fcinelerra%2Fcwindowgui.C;h=22e977bdf3b3ef28e973f726f8bb748c386a5229;hp=567c9338c8f129dbd95995eae96831b6c70e88ef;hb=98e035865979cda9805a58a85d52f8d70a7ec54e;hpb=b78b166faf60a1c7357f990b1e2fb0e70be29fee

diff --git a/cinelerra-5.1/cinelerra/cwindowgui.C b/cinelerra-5.1/cinelerra/cwindowgui.C
index 567c9338..22e977bd 100644
--- a/cinelerra-5.1/cinelerra/cwindowgui.C
+++ b/cinelerra-5.1/cinelerra/cwindowgui.C
@@ -442,12 +442,13 @@ int CWindowGUI::keypress_event()
 		keyboard_zoomout();
 		result = 1;
 		break;
-	case 'f':
-		canvas->set_fullscreen(canvas->get_fullscreen() ? 0 : 1);
+	case 'f': {
+		int on = canvas->get_fullscreen() ? 0 : 1;
+		canvas->set_fullscreen(on, 1);
 		result = 1;
-		break;
+		break; }
 	case ESC:
-		canvas->set_fullscreen(0);
+		canvas->set_fullscreen(0, 1);
 		result = 1;
 		break;
 	case 'x':
@@ -999,19 +1000,19 @@ void CWindowCanvas::update_zoom(int x, int y, float zoom)
 	mwindow->edl->session->cwindow_scrollbars = use_scrollbars;
 }
 
-int CWindowCanvas::set_fullscreen(int on)
+int CWindowCanvas::set_fullscreen(int on, int unlock)
 {
 	int ret = 0;
 	if( on && !get_fullscreen() ) {
 		last_xscroll = get_xscroll();
 		last_yscroll = get_yscroll();
 		last_zoom = get_zoom();
-		Canvas::set_fullscreen(1);
+		Canvas::set_fullscreen(1, unlock);
 		zoom_auto();
 		ret = 1;
 	}
 	if( !on && get_fullscreen() ) {
-		Canvas::set_fullscreen(0);
+		Canvas::set_fullscreen(0, unlock);
 		gui->zoom_panel->update(get_zoom());
 		update_zoom(last_xscroll, last_yscroll, last_zoom);
 		gui->update_canvas();