From f1c70ce53c7a07e12940fb2f06eadf387d92a855 Mon Sep 17 00:00:00 2001 From: jarred wilson <20207921+jardon@users.noreply.github.com> Date: Sun, 23 Feb 2025 14:07:06 -0600 Subject: [PATCH] Fix/display mode default (#2516) * fix: move fullscreen config options to GUI section of variable declarations * fix:[#2514] set display mode default to windowed --- src/common/config.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/common/config.cpp b/src/common/config.cpp index a190e4da1..cc3b86315 100644 --- a/src/common/config.cpp +++ b/src/common/config.cpp @@ -31,10 +31,7 @@ std::filesystem::path find_fs_path_or(const basic_value& v, const K& ky, namespace Config { -static bool isHDRAllowed = false; static bool isNeo = false; -static bool isFullscreen = false; -static std::string fullscreenMode = "Fullscreen (Borderless)"; static bool playBGM = false; static bool isTrophyPopupDisabled = false; static int BGMvolume = 50; @@ -102,6 +99,9 @@ std::vector m_recent_files; std::string emulator_language = "en_US"; static int backgroundImageOpacity = 50; static bool showBackgroundImage = true; +static bool isFullscreen = false; +static std::string fullscreenMode = "Windowed"; +static bool isHDRAllowed = false; // Language u32 m_language = 1; // english @@ -740,8 +740,7 @@ void load(const std::filesystem::path& path) { shouldPatchShaders = toml::find_or(gpu, "patchShaders", true); vblankDivider = toml::find_or(gpu, "vblankDivider", 1); isFullscreen = toml::find_or(gpu, "Fullscreen", false); - fullscreenMode = - toml::find_or(gpu, "FullscreenMode", "Fullscreen (Borderless)"); + fullscreenMode = toml::find_or(gpu, "FullscreenMode", "Windowed"); isHDRAllowed = toml::find_or(gpu, "allowHDR", false); }