Fix fullscreen toggle when dynamic session resize is disabled

When dynamic session resize is disabled, leaving fullscreen should
result in a window that matches the session size.

Co-authored-by: Henrik Andersson <hean01@cendio.com>
Co-authored-by: Karl Mikaelsson <derfian@cendio.se>

1 files changed, 14 insertions, 3 deletions

diff --git a/xwin.c b/xwin.c
index 86a3b90..6fa4343 100644
--- a/xwin.c
+++ b/xwin.c
@@ -2359,11 +2359,22 @@ xwin_toggle_fullscreen(void)
 	}
 	else
 	{
-		/* Restore "old" window size */
+		/* Switch from fullscreen to window mode */
 		x = windowed_x;
 		y = windowed_y;
-		width = windowed_width;
-		height = windowed_height;
+
+		if (g_dynamic_session_resize)
+		{
+			/* Restore "old" window size, resize session to fit */
+			width = windowed_width;
+			height = windowed_height;
+		}
+		else
+		{
+			/* Resize window to fit session size */
+			width = g_session_width;
+			height = g_session_height;
+		}
 	}
 
 	logger(GUI, Debug, "xwin_toggle_fullscreen(), new window: %dx%d+%d+%d, last window: %dx%d",