From 7a70ccfe2e23cd7ed480214818a8d0c29287b59a Mon Sep 17 00:00:00 2001 From: tildearrow Date: Mon, 13 Dec 2021 20:55:40 -0500 Subject: [PATCH] use docking branch --- .gitmodules | 1 + extern/imgui | 2 +- src/gui/gui.cpp | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index b3308c26..d27443da 100644 --- a/.gitmodules +++ b/.gitmodules @@ -12,6 +12,7 @@ [submodule "extern/imgui"] path = extern/imgui url = https://github.com/ocornut/imgui.git + branch = docking [submodule "extern/fmt"] path = extern/fmt url = https://github.com/fmtlib/fmt.git diff --git a/extern/imgui b/extern/imgui index 8a9fe268..747f7fdb 160000 --- a/extern/imgui +++ b/extern/imgui @@ -1 +1 @@ -Subproject commit 8a9fe268662292ed9495048d942d8d0341c03185 +Subproject commit 747f7fdbbaa1fdd46d5115c7333ab0722a7c2afc diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 9a8904e9..1e4745f3 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -689,6 +689,8 @@ bool FurnaceGUI::init() { sty.ScaleAllSizes(dpiScale); + ImGui::GetIO().ConfigFlags|=ImGuiConfigFlags_DockingEnable; + if ((mainFont=ImGui::GetIO().Fonts->AddFontFromMemoryCompressedTTF(defFont_main_compressed_data,defFont_main_compressed_size,18*dpiScale))==NULL) { logE("could not load UI font!\n"); return false;