From 9282f1fe75e7853fb1528b14de0fd3adaab4f2af Mon Sep 17 00:00:00 2001 From: WerWolv Date: Mon, 26 Jun 2023 09:02:23 +0200 Subject: [PATCH] fix: Multiwindow support not being disabled by default on Linux --- main/source/window/window.cpp | 8 +------- plugins/builtin/source/content/settings_entries.cpp | 8 +++++++- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/main/source/window/window.cpp b/main/source/window/window.cpp index e9242acb2..f2e623bdf 100644 --- a/main/source/window/window.cpp +++ b/main/source/window/window.cpp @@ -934,13 +934,7 @@ namespace hex { io.FontGlobalScale = 1.0F; if (glfwGetPrimaryMonitor() != nullptr) { - #if defined (OS_LINUX) - constexpr static auto MultiWindowSupportEnabledDefault = 0; - #else - constexpr static auto MultiWindowSupportEnabledDefault = 1; - #endif - - bool multiWindowEnabled = ContentRegistry::Settings::read("hex.builtin.setting.interface", "hex.builtin.setting.interface.multi_windows", MultiWindowSupportEnabledDefault) != 0; + bool multiWindowEnabled = ContentRegistry::Settings::read("hex.builtin.setting.interface", "hex.builtin.setting.interface.multi_windows", 0) != 0; if (multiWindowEnabled) io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable; diff --git a/plugins/builtin/source/content/settings_entries.cpp b/plugins/builtin/source/content/settings_entries.cpp index fcc82c02c..dc359df81 100644 --- a/plugins/builtin/source/content/settings_entries.cpp +++ b/plugins/builtin/source/content/settings_entries.cpp @@ -263,7 +263,13 @@ namespace hex::plugin::builtin { return false; }); - ContentRegistry::Settings::add("hex.builtin.setting.interface", "hex.builtin.setting.interface.multi_windows", 1, [](auto name, nlohmann::json &setting) { + #if defined (OS_LINUX) + constexpr static auto MultiWindowSupportEnabledDefault = 0; + #else + constexpr static auto MultiWindowSupportEnabledDefault = 1; + #endif + + ContentRegistry::Settings::add("hex.builtin.setting.interface", "hex.builtin.setting.interface.multi_windows", MultiWindowSupportEnabledDefault, [](auto name, nlohmann::json &setting) { static bool enabled = static_cast(setting); if (ImGui::Checkbox(name.data(), &enabled)) {