mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-06 05:17:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking

Browse Source 
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_win32.cpp
This commit is contained in:
ocornut
2024-07-15 11:21:18 +02:00
parent 527b2c45af 9c2f6003e4
commit 5ea96c15cd
13 changed files with 170 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/example_glfw_opengl3/main.cpp
View File

@@ -97,7 +97,7 @@ int main(int, char**)
// Setup Platform/Renderer backends
ImGui_ImplGlfw_InitForOpenGL(window, true);
#ifdef __EMSCRIPTEN__
ImGui_ImplGlfw_InstallEmscriptenCanvasResizeCallback("#canvas");
ImGui_ImplGlfw_InstallEmscriptenCallbacks(window, "#canvas");
#endif
ImGui_ImplOpenGL3_Init(glsl_version);