Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[submodule "imgui"]
path = src/libs/src/imgui
url = https://github.com/ocornut/imgui.git
branch = docking
3 changes: 3 additions & 0 deletions src/LibSL/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ SET(LIBSL_GL_SOURCE
../libs/src/imgui/misc/cpp/imgui_stdlib.cpp
../libs/src/imgui/imgui_draw.cpp
../libs/src/imgui/imgui_widgets.cpp
../libs/src/imgui/imgui_tables.cpp
)

SET(LIBSL_GL4_HEADERS
Expand Down Expand Up @@ -239,6 +240,7 @@ SET(LIBSL_GL4_SOURCE
../libs/src/imgui/misc/cpp/imgui_stdlib.cpp
../libs/src/imgui/imgui_draw.cpp
../libs/src/imgui/imgui_widgets.cpp
../libs/src/imgui/imgui_tables.cpp
)

SET(LIBSL_GL4CORE_HEADERS
Expand Down Expand Up @@ -272,6 +274,7 @@ SET(LIBSL_GL4CORE_SOURCE
../libs/src/imgui/misc/cpp/imgui_stdlib.cpp
../libs/src/imgui/imgui_draw.cpp
../libs/src/imgui/imgui_widgets.cpp
../libs/src/imgui/imgui_tables.cpp
)

CreateSourceGroups("Header files" src "${LIBSL_GL_HEADERS}")
Expand Down
9 changes: 8 additions & 1 deletion src/LibSL/UIHelpers/BindImGui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,8 @@ static void bindOnRender()
ImGui_ImplSimpleUI_NewFrame();

if (prevOnRender) prevOnRender();

ImGui_ImplSimpleUI_RenderDrawLists(ImGui::GetDrawData());
}

static void bindMouseMotion(uint x, uint y)
Expand Down Expand Up @@ -563,10 +565,15 @@ void NAMESPACE::initImGui()
ImGui_generic_init();

ImGuiIO& io = ::ImGui::GetIO();
io.RenderDrawListsFn = ImGui_ImplSimpleUI_RenderDrawLists;
//io.RenderDrawListsFn = ImGui_ImplSimpleUI_RenderDrawLists;
io.SetClipboardTextFn = ImGui_ImplSimpleUI_SetClipboardText;
io.GetClipboardTextFn = ImGui_ImplSimpleUI_GetClipboardText;

#ifdef IMGUI_HAS_DOCK
io.ConfigFlags |= ImGuiConfigFlags_DockingEnable;
#endif // IMGUI_HAS_DOCK


ForIndex(i, IM_ARRAYSIZE(io.KeysDown)) {
io.KeysDown[i] = false;
}
Expand Down
1 change: 1 addition & 0 deletions src/libs/src/imgui
Submodule imgui added at f33737
20 changes: 0 additions & 20 deletions src/libs/src/imgui/.editorconfig

This file was deleted.

34 changes: 0 additions & 34 deletions src/libs/src/imgui/.travis.yml

This file was deleted.

21 changes: 0 additions & 21 deletions src/libs/src/imgui/LICENSE.txt

This file was deleted.

1,172 changes: 0 additions & 1,172 deletions src/libs/src/imgui/docs/CHANGELOG.txt

This file was deleted.

330 changes: 0 additions & 330 deletions src/libs/src/imgui/docs/README.md

This file was deleted.

324 changes: 0 additions & 324 deletions src/libs/src/imgui/docs/TODO.txt

This file was deleted.

42 changes: 0 additions & 42 deletions src/libs/src/imgui/docs/issue_template.md

This file was deleted.

6 changes: 0 additions & 6 deletions src/libs/src/imgui/docs/pull_request_template.md

This file was deleted.

73 changes: 0 additions & 73 deletions src/libs/src/imgui/imconfig.h

This file was deleted.

Loading