use docking branch

This commit is contained in:
tildearrow 2021-12-13 20:55:40 -05:00
parent 3af0a9feda
commit 7a70ccfe2e
3 changed files with 4 additions and 1 deletions

1
.gitmodules vendored
View File

@ -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

2
extern/imgui vendored

@ -1 +1 @@
Subproject commit 8a9fe268662292ed9495048d942d8d0341c03185
Subproject commit 747f7fdbbaa1fdd46d5115c7333ab0722a7c2afc

View File

@ -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;