mirror of
https://github.com/Drezil/imgui.git
synced 2024-11-15 01:17:00 +00:00
This commit is contained in:
parent
d8ef864b02
commit
56a7b8b724
@ -629,6 +629,9 @@ void ImGui_ImplGlfw_Shutdown()
|
|||||||
|
|
||||||
if (bd->InstalledCallbacks)
|
if (bd->InstalledCallbacks)
|
||||||
ImGui_ImplGlfw_RestoreCallbacks(bd->Window);
|
ImGui_ImplGlfw_RestoreCallbacks(bd->Window);
|
||||||
|
#ifdef __EMSCRIPTEN__
|
||||||
|
emscripten_set_wheel_callback(EMSCRIPTEN_EVENT_TARGET_DOCUMENT, nullptr, false, nullptr);
|
||||||
|
#endif
|
||||||
|
|
||||||
for (ImGuiMouseCursor cursor_n = 0; cursor_n < ImGuiMouseCursor_COUNT; cursor_n++)
|
for (ImGuiMouseCursor cursor_n = 0; cursor_n < ImGuiMouseCursor_COUNT; cursor_n++)
|
||||||
glfwDestroyCursor(bd->MouseCursors[cursor_n]);
|
glfwDestroyCursor(bd->MouseCursors[cursor_n]);
|
||||||
|
@ -47,6 +47,7 @@ Other changes:
|
|||||||
- InputTextMultiline: Fixed a crash pressing Down on last empty line of a multiline buffer.
|
- InputTextMultiline: Fixed a crash pressing Down on last empty line of a multiline buffer.
|
||||||
(regression from 1.89.2, only happened in some states). (#6783, #6000)
|
(regression from 1.89.2, only happened in some states). (#6783, #6000)
|
||||||
- BeginListBox(): Fixed not consuming SetNextWindowXXX data when returning false.
|
- BeginListBox(): Fixed not consuming SetNextWindowXXX data when returning false.
|
||||||
|
- Backends: GLFW: Clear emscripten's MouseWheel callback before shutdown. (#6790, #6096, #4019) [@halx99]
|
||||||
|
|
||||||
|
|
||||||
-----------------------------------------------------------------------
|
-----------------------------------------------------------------------
|
||||||
|
Loading…
Reference in New Issue
Block a user