From 8b6d0cdf7ca7023f0029dbdb2357f2ee43879a42 Mon Sep 17 00:00:00 2001
From: Jarred Wilson <jarred.wilson12@gmail.com>
Date: Fri, 21 Feb 2025 08:19:28 -0600
Subject: [PATCH] rearrange settings config for new schema

---
 src/common/config.cpp | 11 ++++++-----
 src/sdl_window.cpp    |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/common/config.cpp b/src/common/config.cpp
index 32c5e670b..2e22e304a 100644
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -34,7 +34,7 @@ namespace Config {
 static bool isHDRAllowed = false;
 static bool isNeo = false;
 static bool isFullscreen = false;
-static std::string fullscreenMode = "borderless";
+static std::string fullscreenMode = "Fullscreen (Borderless)";
 static bool playBGM = false;
 static bool isTrophyPopupDisabled = false;
 static int BGMvolume = 50;
@@ -696,8 +696,6 @@ void load(const std::filesystem::path& path) {
 
         isHDRAllowed = toml::find_or<bool>(general, "allowHDR", false);
         isNeo = toml::find_or<bool>(general, "isPS4Pro", false);
-        isFullscreen = toml::find_or<bool>(general, "Fullscreen", false);
-        fullscreenMode = toml::find_or<std::string>(general, "FullscreenMode", "borderless");
         playBGM = toml::find_or<bool>(general, "playBGM", false);
         isTrophyPopupDisabled = toml::find_or<bool>(general, "isTrophyPopupDisabled", false);
         BGMvolume = toml::find_or<int>(general, "BGMvolume", 50);
@@ -742,6 +740,9 @@ void load(const std::filesystem::path& path) {
         shouldDumpShaders = toml::find_or<bool>(gpu, "dumpShaders", false);
         shouldPatchShaders = toml::find_or<bool>(gpu, "patchShaders", true);
         vblankDivider = toml::find_or<int>(gpu, "vblankDivider", 1);
+        isFullscreen = toml::find_or<bool>(gpu, "Fullscreen", false);
+        fullscreenMode =
+            toml::find_or<std::string>(gpu, "FullscreenMode", "Fullscreen (Borderless)");
     }
 
     if (data.contains("Vulkan")) {
@@ -846,8 +847,6 @@ void save(const std::filesystem::path& path) {
 
     data["General"]["allowHDR"] = isHDRAllowed;
     data["General"]["isPS4Pro"] = isNeo;
-    data["General"]["Fullscreen"] = isFullscreen;
-    data["General"]["FullscreenMode"] = fullscreenMode;
     data["General"]["isTrophyPopupDisabled"] = isTrophyPopupDisabled;
     data["General"]["playBGM"] = playBGM;
     data["General"]["BGMvolume"] = BGMvolume;
@@ -877,6 +876,8 @@ void save(const std::filesystem::path& path) {
     data["GPU"]["dumpShaders"] = shouldDumpShaders;
     data["GPU"]["patchShaders"] = shouldPatchShaders;
     data["GPU"]["vblankDivider"] = vblankDivider;
+    data["GPU"]["Fullscreen"] = isFullscreen;
+    data["GPU"]["FullscreenMode"] = fullscreenMode;
     data["Vulkan"]["gpuId"] = gpuId;
     data["Vulkan"]["validation"] = vkValidation;
     data["Vulkan"]["validation_sync"] = vkValidationSync;
diff --git a/src/sdl_window.cpp b/src/sdl_window.cpp
index db6f37e2a..943746e3f 100644
--- a/src/sdl_window.cpp
+++ b/src/sdl_window.cpp
@@ -290,8 +290,8 @@ WindowSDL::WindowSDL(s32 width_, s32 height_, Input::GameController* controller_
         error = true;
     }
     if (!error) {
-        SDL_SetWindowFullscreenMode(window,
-                                    Config::getFullscreenMode() == "True" ? displayMode : NULL);
+        SDL_SetWindowFullscreenMode(
+            window, Config::getFullscreenMode() == "Fullscreen" ? displayMode : NULL);
     }
     SDL_SetWindowFullscreen(window, Config::getIsFullscreen());