Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-01-31 03:53:44 +01:00
Code Releases Wiki Activity

fix: Multiwindow support not being disabled by default on Linux

Browse Source
This commit is contained in:
WerWolv 2023-06-26 09:02:23 +02:00
parent af147b4f54
commit 9282f1fe75
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main/source/window/window.cpp
View File

@ -934,13 +934,7 @@ namespace hex {
io.FontGlobalScale = 1.0F; io.FontGlobalScale = 1.0F;
if (glfwGetPrimaryMonitor() != nullptr) { if (glfwGetPrimaryMonitor() != nullptr) {
#if defined (OS_LINUX) bool multiWindowEnabled = ContentRegistry::Settings::read("hex.builtin.setting.interface", "hex.builtin.setting.interface.multi_windows", 0) != 0;
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;
if (multiWindowEnabled) if (multiWindowEnabled)
io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable; io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;

8
plugins/builtin/source/content/settings_entries.cpp
View File

@ -263,7 +263,13 @@ namespace hex::plugin::builtin {
return false; 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<int>(setting); static bool enabled = static_cast<int>(setting);
if (ImGui::Checkbox(name.data(), &enabled)) { if (ImGui::Checkbox(name.data(), &enabled)) {