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

sys: Added setting to disable multi-window support

Browse Source
This commit is contained in:
WerWolv 2022-10-06 21:26:24 +02:00
parent eb247b8607
commit 210106901e
11 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
main/source/main.cpp
View File

@ -20,9 +20,8 @@ int main(int argc, char **argv, char **envp) {
bool shouldRestart = false;
EventManager::subscribe<RequestRestartImHex>([&]{ shouldRestart = true; });
do {
EventManager::subscribe<RequestRestartImHex>([&]{ shouldRestart = true; });
shouldRestart = false;
// Initialization

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

@ -684,8 +684,9 @@ namespace hex {
if (glfwGetPrimaryMonitor() != nullptr) {
auto sessionType = hex::getEnvironmentVariable("XDG_SESSION_TYPE");
bool multiWindowEnabled = ContentRegistry::Settings::read("hex.builtin.setting.interface", "hex.builtin.setting.interface.multi_windows", 1) != 0;
if (!sessionType || !hex::containsIgnoreCase(*sessionType, "wayland"))
if ((!sessionType || !hex::containsIgnoreCase(*sessionType, "wayland")) && multiWindowEnabled)
io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;
}

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

@ -185,6 +185,17 @@ 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) {
static bool enabled = static_cast<int>(setting);
if (ImGui::Checkbox(name.data(), &enabled)) {
setting = static_cast<int>(enabled);
return true;
}
return false;
}, true);
ContentRegistry::Settings::add("hex.builtin.setting.hex_editor", "hex.builtin.setting.hex_editor.highlight_color", 0x60C08080, [](auto name, nlohmann::json &setting) {
static auto color = static_cast<color_t>(setting);

1
plugins/builtin/source/lang/de_DE.cpp
View File

@ -770,6 +770,7 @@ namespace hex::plugin::builtin {
{ "hex.builtin.setting.interface.wiki_explain_language", "Wikipedia Sprache" },
{ "hex.builtin.setting.interface.fps", "FPS Limite" },
{ "hex.builtin.setting.interface.fps.unlocked", "Unbegrenzt" },
{ "hex.builtin.setting.interface.multi_windows", "Multi-Window-Unterstützung aktivieren" },
{ "hex.builtin.setting.hex_editor", "Hex Editor" },
{ "hex.builtin.setting.hex_editor.highlight_color", "Auswahlfarbe" },
{ "hex.builtin.setting.hex_editor.bytes_per_row", "Bytes pro Zeile" },

1
plugins/builtin/source/lang/en_US.cpp
View File

@ -774,6 +774,7 @@ namespace hex::plugin::builtin {
{ "hex.builtin.setting.interface.wiki_explain_language", "Wikipedia Language" },
{ "hex.builtin.setting.interface.fps", "FPS Limit" },
{ "hex.builtin.setting.interface.fps.unlocked", "Unlocked" },
{ "hex.builtin.setting.interface.multi_windows", "Enable Multi Window support" },
{ "hex.builtin.setting.hex_editor", "Hex Editor" },
{ "hex.builtin.setting.hex_editor.highlight_color", "Selection highlight color" },
{ "hex.builtin.setting.hex_editor.bytes_per_row", "Bytes per row" },

1
plugins/builtin/source/lang/it_IT.cpp
View File

@ -780,6 +780,7 @@ namespace hex::plugin::builtin {
{ "hex.builtin.setting.interface.scaling.x2_0", "x4.0" },
{ "hex.builtin.setting.interface.fps", "Limite FPS" },
{ "hex.builtin.setting.interface.fps.unlocked", "Unblocca" },
//{ "hex.builtin.setting.interface.multi_windows", "Enable Multi Window support" },
{ "hex.builtin.setting.hex_editor", "Hex Editor" },
//{ "hex.builtin.setting.hex_editor.highlight_color", "Selection highlight color" },
//{ "hex.builtin.setting.hex_editor.bytes_per_row", "Bytes per row" },

1
plugins/builtin/source/lang/ja_JP.cpp
View File

@ -776,6 +776,7 @@ namespace hex::plugin::builtin {
//{ "hex.builtin.setting.interface.wiki_explain_language", "Wikipedia Language" },
{ "hex.builtin.setting.interface.fps", "FPS制限" },
{ "hex.builtin.setting.interface.fps.unlocked", "無制限" },
//{ "hex.builtin.setting.interface.multi_windows", "Enable Multi Window support" },
{ "hex.builtin.setting.hex_editor", "Hexエディタ" },
{ "hex.builtin.setting.hex_editor.highlight_color", "選択範囲の色" },
{ "hex.builtin.setting.hex_editor.bytes_per_row", "１行のバイト数" },

1
plugins/builtin/source/lang/ko_KR.cpp
View File

@ -773,6 +773,7 @@ namespace hex::plugin::builtin {
{ "hex.builtin.setting.interface.wiki_explain_language", "Wikipedia 언어" },
{ "hex.builtin.setting.interface.fps", "FPS 제한" },
{ "hex.builtin.setting.interface.fps.unlocked", "제한 없음" },
//{ "hex.builtin.setting.interface.multi_windows", "Enable Multi Window support" },
{ "hex.builtin.setting.hex_editor", "헥스 편집기" },
{ "hex.builtin.setting.hex_editor.highlight_color", "선택 영역 색상 하이라이트" },
{ "hex.builtin.setting.hex_editor.bytes_per_row", "한 줄당 바이트 수" },

1
plugins/builtin/source/lang/pt_BR.cpp
View File

@ -772,6 +772,7 @@ namespace hex::plugin::builtin {
{ "hex.builtin.setting.interface.wiki_explain_language", "Idioma do Wikipedia" },
{ "hex.builtin.setting.interface.fps", "FPS Limit" },
{ "hex.builtin.setting.interface.fps.unlocked", "Destravado" },
//{ "hex.builtin.setting.interface.multi_windows", "Enable Multi Window support" },
{ "hex.builtin.setting.hex_editor", "Hex Editor" },
//{ "hex.builtin.setting.hex_editor.highlight_color", "Selection highlight color" },
{ "hex.builtin.setting.hex_editor.bytes_per_row", "Bytes por linha" },

1
plugins/builtin/source/lang/zh_CN.cpp
View File

@ -775,6 +775,7 @@ namespace hex::plugin::builtin {
{ "hex.builtin.setting.interface.wiki_explain_language", "维基百科使用语言" },
{ "hex.builtin.setting.interface.fps", "FPS 限制" },
{ "hex.builtin.setting.interface.fps.unlocked", "无限制" },
//{ "hex.builtin.setting.interface.multi_windows", "Enable Multi Window support" },
{ "hex.builtin.setting.hex_editor", "Hex 编辑器" },
{ "hex.builtin.setting.hex_editor.highlight_color", "选区高亮色" },
{ "hex.builtin.setting.hex_editor.bytes_per_row", "每行显示的字节数" },

1
plugins/builtin/source/lang/zh_TW.cpp
View File

@ -772,6 +772,7 @@ namespace hex::plugin::builtin {
{ "hex.builtin.setting.interface.wiki_explain_language", "維基百科語言" },
{ "hex.builtin.setting.interface.fps", "FPS 限制" },
{ "hex.builtin.setting.interface.fps.unlocked", "解鎖" },
//{ "hex.builtin.setting.interface.multi_windows", "Enable Multi Window support" },
{ "hex.builtin.setting.hex_editor", "十六進位編輯器" },
//{ "hex.builtin.setting.hex_editor.highlight_color", "Selection highlight color" },
//{ "hex.builtin.setting.hex_editor.bytes_per_row", "Bytes per row" },