From 03c38185f63e0296af7c4072a02d9f26e96ef287 Mon Sep 17 00:00:00 2001
From: Alex Szpakowski <slime73@gmail.com>
Date: Mon, 10 Oct 2016 09:14:57 -0300
Subject: [PATCH] Fix love.window.maximize to immediately update the window
 dimensions instead of waiting for the next love.event.pump. Fixes issue
 #1221.

---
 src/modules/window/sdl/Window.cpp | 26 ++++++++++++++++----------
 src/modules/window/sdl/Window.h   |  2 +-
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/modules/window/sdl/Window.cpp b/src/modules/window/sdl/Window.cpp
index dca71fd18..90cccd7bd 100644
--- a/src/modules/window/sdl/Window.cpp
+++ b/src/modules/window/sdl/Window.cpp
@@ -485,14 +485,14 @@ bool Window::setWindow(int width, int height, WindowSettings *settings)
 
 	SDL_GL_SetSwapInterval(f.vsync ? 1 : 0);
 
-	updateSettings(f);
+	updateSettings(f, false);
 
 	auto gfx = Module::getInstance<graphics::Graphics>(Module::M_GRAPHICS);
 	if (gfx != nullptr)
 		gfx->setMode(pixelWidth, pixelHeight);
 
 #ifdef LOVE_ANDROID
-		love::android::setImmersive(f.fullscreen);
+	love::android::setImmersive(f.fullscreen);
 #endif
 
 	return true;
@@ -515,7 +515,7 @@ bool Window::onSizeChanged(int width, int height)
 	return true;
 }
 
-void Window::updateSettings(const WindowSettings &newsettings)
+void Window::updateSettings(const WindowSettings &newsettings, bool updateGraphicsViewport)
 {
 	Uint32 wflags = SDL_GetWindowFlags(window);
 
@@ -575,13 +575,21 @@ void Window::updateSettings(const WindowSettings &newsettings)
 
 	// May be 0 if the refresh rate can't be determined.
 	settings.refreshrate = (double) dmode.refresh_rate;
+
+	if (updateGraphicsViewport)
+	{
+		// Update the viewport size now instead of waiting for event polling.
+		auto gfx = Module::getInstance<graphics::Graphics>(Module::M_GRAPHICS);
+		if (gfx != nullptr)
+			gfx->setViewportSize(pixelWidth, pixelHeight);
+	}
 }
 
 void Window::getWindow(int &width, int &height, WindowSettings &newsettings)
 {
 	// The window might have been modified (moved, resized, etc.) by the user.
 	if (window)
-		updateSettings(settings);
+		updateSettings(settings, true);
 
 	width = windowWidth;
 	height = windowHeight;
@@ -648,17 +656,12 @@ bool Window::setFullscreen(bool fullscreen, Window::FullscreenType fstype)
 	if (SDL_SetWindowFullscreen(window, sdlflags) == 0)
 	{
 		SDL_GL_MakeCurrent(window, context);
-		updateSettings(newsettings);
+		updateSettings(newsettings, true);
 
 		// Apparently this gets un-set when we exit fullscreen (at least in OS X).
 		if (!fullscreen)
 			SDL_SetWindowMinimumSize(window, settings.minwidth, settings.minheight);
 
-		// Update the viewport size now instead of waiting for event polling.
-		auto gfx = Module::getInstance<graphics::Graphics>(Module::M_GRAPHICS);
-		if (gfx != nullptr)
-			gfx->setViewportSize(pixelWidth, pixelHeight);
-
 		return true;
 	}
 
@@ -857,7 +860,10 @@ void Window::minimize()
 void Window::maximize()
 {
 	if (window != nullptr)
+	{
 		SDL_MaximizeWindow(window);
+		updateSettings(settings, true);
+	}
 }
 
 void Window::swapBuffers()
diff --git a/src/modules/window/sdl/Window.h b/src/modules/window/sdl/Window.h
index b459a2173..167aa8450 100644
--- a/src/modules/window/sdl/Window.h
+++ b/src/modules/window/sdl/Window.h
@@ -125,7 +125,7 @@ private:
 	bool createWindowAndContext(int x, int y, int w, int h, Uint32 windowflags, int msaa);
 
 	// Update the saved window settings based on the window's actual state.
-	void updateSettings(const WindowSettings &newsettings);
+	void updateSettings(const WindowSettings &newsettings, bool updateGraphicsViewport);
 
 	SDL_MessageBoxFlags convertMessageBoxType(MessageBoxType type) const;