[API] Add callback freeing to ImGuiImplGlfw (#146)

Co-authored-by: SpaiR <klimbetoo@gmail.com>
This commit is contained in:
Aiden LambertandSpaiR authored and GitHub committed 2022-11-24 22:25:23 +02:00
1 parent f4214c29dc
commit 62377c7b1d
1 file changed
+15 -9
@@ -32,6 +32,7 @@ import org.lwjgl.glfw.GLFWNativeWin32;
import org.lwjgl.glfw.GLFWScrollCallback; import org.lwjgl.glfw.GLFWScrollCallback;
import org.lwjgl.glfw.GLFWVidMode; import org.lwjgl.glfw.GLFWVidMode;
import org.lwjgl.glfw.GLFWWindowFocusCallback; import org.lwjgl.glfw.GLFWWindowFocusCallback;
import org.lwjgl.glfw.Callbacks;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;
@@ -317,12 +318,11 @@ public class ImGuiImplGlfw {
prevUserCallbackScroll = glfwSetScrollCallback(windowId, this::scrollCallback); prevUserCallbackScroll = glfwSetScrollCallback(windowId, this::scrollCallback);
prevUserCallbackKey = glfwSetKeyCallback(windowId, this::keyCallback); prevUserCallbackKey = glfwSetKeyCallback(windowId, this::keyCallback);
prevUserCallbackChar = glfwSetCharCallback(windowId, this::charCallback); prevUserCallbackChar = glfwSetCharCallback(windowId, this::charCallback);
prevUserCallbackMonitor = glfwSetMonitorCallback(this::monitorCallback);
} }
// Update monitors the first time (note: monitor callback are broken in GLFW 3.2 and earlier, see github.com/glfw/glfw/issues/784) // Update monitors the first time (note: monitor callback are broken in GLFW 3.2 and earlier, see github.com/glfw/glfw/issues/784)
updateMonitors(); updateMonitors();
glfwSetMonitorCallback(this::monitorCallback); prevUserCallbackMonitor = glfwSetMonitorCallback(this::monitorCallback);
// Our mouse update function expect PlatformHandle to be filled for the main viewport // Our mouse update function expect PlatformHandle to be filled for the main viewport
final ImGuiViewport mainViewport = ImGui.getMainViewport(); final ImGuiViewport mainViewport = ImGui.getMainViewport();
@@ -373,15 +373,20 @@ public class ImGuiImplGlfw {
public void dispose() { public void dispose() {
shutdownPlatformInterface(); shutdownPlatformInterface();
try {
if (callbacksInstalled) { if (callbacksInstalled) {
glfwSetWindowFocusCallback(windowPtr, prevUserCallbackWindowFocus); glfwSetWindowFocusCallback(windowPtr, prevUserCallbackWindowFocus).free();
glfwSetCursorEnterCallback(windowPtr, prevUserCallbackCursorEnter); glfwSetCursorEnterCallback(windowPtr, prevUserCallbackCursorEnter).free();
glfwSetMouseButtonCallback(windowPtr, prevUserCallbackMouseButton); glfwSetMouseButtonCallback(windowPtr, prevUserCallbackMouseButton).free();
glfwSetScrollCallback(windowPtr, prevUserCallbackScroll); glfwSetScrollCallback(windowPtr, prevUserCallbackScroll).free();
glfwSetKeyCallback(windowPtr, prevUserCallbackKey); glfwSetKeyCallback(windowPtr, prevUserCallbackKey).free();
glfwSetCharCallback(windowPtr, prevUserCallbackChar); glfwSetCharCallback(windowPtr, prevUserCallbackChar).free();
callbacksInstalled = false; callbacksInstalled = false;
} }
glfwSetMonitorCallback(prevUserCallbackMonitor).free();
} catch (NullPointerException ignored) {
// ignored
}
for (int i = 0; i < ImGuiMouseCursor.COUNT; i++) { for (int i = 0; i < ImGuiMouseCursor.COUNT; i++) {
glfwDestroyCursor(mouseCursors[i]); glfwDestroyCursor(mouseCursors[i]);
@@ -693,6 +698,7 @@ public class ImGuiImplGlfw {
} }
} }
Callbacks.glfwFreeCallbacks(data.window);
glfwDestroyWindow(data.window); glfwDestroyWindow(data.window);
} }