Merge lp:~widelands-dev/widelands/fsmenu_fullscreen_0_flicker into lp:widelands

[GunChleoc]

Stop fullscreen toggle from flickering.

The problem is that the SDL keypress event gets triggered multiple times for some reason, switching fullscreen mode on and off.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1460. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/170500691.
Appveyor build 1303. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fsmenu_fullscreen_0_flicker-1303.

[Tino (tino79)]

Compiles and works on win.

review: Approve

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1538. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/171788191.
Appveyor build 1380. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fsmenu_fullscreen_0_flicker-1380.

[GunChleoc (gunchleoc)]

@bunnybot merge

=== modified file 'src/wlapplication.cc'
--- src/wlapplication.cc	2016-10-16 09:31:42 +0000
+++ src/wlapplication.cc	2016-10-30 15:37:21 +0000
@@ -289,7 +289,8 @@
 #else
      homedir_(FileSystem::get_homedir() + "/.widelands"),
 #endif
-     redirected_stdio_(false) {
+     redirected_stdio_(false),
+     last_resolution_change_(0) {
 	g_fs = new LayeredFileSystem();
 
 	parse_commandline(argc, argv);  // throws ParameterError, handled by main.cc
@@ -519,10 +520,14 @@
 			return true;
 
 		case SDLK_f: {
-			// toggle fullscreen
-			bool value = !g_gr->fullscreen();
-			g_gr->set_fullscreen(value);
-			g_options.pull_section("global").set_bool("fullscreen", value);
+			// Toggle fullscreen
+			const uint32_t time = SDL_GetTicks();
+			if (time - last_resolution_change_ > 250) {
+				last_resolution_change_ = time;
+				bool value = !g_gr->fullscreen();
+				g_gr->set_fullscreen(value);
+				g_options.pull_section("global").set_bool("fullscreen", value);
+			}
 			return true;
 		}
 

=== modified file 'src/wlapplication.h'
--- src/wlapplication.h	2016-10-16 09:31:42 +0000
+++ src/wlapplication.h	2016-10-30 15:37:21 +0000
@@ -261,6 +261,9 @@
 	std::string datadir_;
 	std::string datadir_for_testing_;
 
+	/// Prevent toggling fullscreen on and off from flickering
+	uint32_t last_resolution_change_;
+
 	/// Holds this process' one and only instance of WLApplication, if it was
 	/// created already. nullptr otherwise.
 	/// \note This is private on purpose. Read the class documentation.