update fullscreen switcher

Author: malytomas

sources/include/cage-simple/fullscreenSwitcher.h

@@ -14,16 +14,22 @@ namespace cage
 		ModifiersFlags keyModifiers = ModifiersFlags::None;
 
 		void update(bool fullscreen);
+		void toggle();
+		void restoreFromConfig();
 	};
 
+	namespace detail
+	{
+		bool defaultFullscreenSettingFromEnvironment();
+	}
+
 	struct FullscreenSwitcherCreateConfig
 	{
 		String configPrefix;
 		Window *window = nullptr;
-		bool defaultFullscreen = true;
+		bool defaultFullscreen = detail::defaultFullscreenSettingFromEnvironment();
 
 		FullscreenSwitcherCreateConfig();
-		explicit FullscreenSwitcherCreateConfig(bool defaultFullscreen);
 	};
 
 	Holder<FullscreenSwitcher> newFullscreenSwitcher(const FullscreenSwitcherCreateConfig &config);

sources/libsimple/fullscreenSwitcher.cpp

@@ -109,7 +109,7 @@ namespace cage
 			{
 				if (in.mods == keyModifiers && in.key == keyToggleFullscreen)
 				{
-					update(!window->isFullscreen());
+					toggle();
 					return true;
 				}
 				return false;
@@ -123,9 +123,21 @@ namespace cage
 		impl->update(fullscreen);
 	}
 
-	namespace
+	void FullscreenSwitcher::toggle()
+	{
+		FullscreenSwitcherImpl *impl = (FullscreenSwitcherImpl *)this;
+		update(!impl->window->isFullscreen());
+	}
+
+	void FullscreenSwitcher::restoreFromConfig()
 	{
-		bool defaultFullscreenEnvironment()
+		FullscreenSwitcherImpl *impl = (FullscreenSwitcherImpl *)this;
+		impl->update(impl->confFullscreenEnabled);
+	}
+
+	namespace detail
+	{
+		bool defaultFullscreenSettingFromEnvironment()
 		{
 			const char *env = std::getenv("CAGE_FULLSCREEN_DEFAULT");
 			if (!env)
@@ -144,9 +156,7 @@ namespace cage
 		}
 	}
 
-	FullscreenSwitcherCreateConfig::FullscreenSwitcherCreateConfig() : FullscreenSwitcherCreateConfig(defaultFullscreenEnvironment()) {}
-
-	FullscreenSwitcherCreateConfig::FullscreenSwitcherCreateConfig(bool defaultFullscreen) : defaultFullscreen(defaultFullscreen)
+	FullscreenSwitcherCreateConfig::FullscreenSwitcherCreateConfig()
 	{
 		configPrefix = detail::globalConfigPrefix();
 		window = cage::engineWindow();