mirror of
				https://github.com/Drezil/imgui.git
				synced 2025-11-04 15:11:05 +01:00 
			
		
		
		
	Merge branch 'master' into viewport + specific changes for GLFW callbacks
# Conflicts: # examples/example_glfw_opengl3/main.cpp # examples/example_win32_directx11/main.cpp # examples/example_win32_directx9/main.cpp # examples/imgui_impl_glfw.cpp
This commit is contained in:
		@@ -26,9 +26,8 @@ IMGUI_IMPL_API bool     ImGui_ImplGlfw_InitForVulkan(GLFWwindow* window, bool in
 | 
			
		||||
IMGUI_IMPL_API void     ImGui_ImplGlfw_Shutdown();
 | 
			
		||||
IMGUI_IMPL_API void     ImGui_ImplGlfw_NewFrame();
 | 
			
		||||
 | 
			
		||||
// GLFW callbacks (installed by default if you enable 'install_callbacks' during initialization)
 | 
			
		||||
// Provided here if you want to chain callbacks.
 | 
			
		||||
// You can also handle inputs yourself and use those as a reference.
 | 
			
		||||
// InitXXX function with 'install_callbacks=true': install GLFW callbacks. They will call user's previously installed callbacks, if any.
 | 
			
		||||
// InitXXX function with 'install_callbacks=false': do not install GLFW callbacks. You will need to call them yourself from your own GLFW callbacks.
 | 
			
		||||
IMGUI_IMPL_API void     ImGui_ImplGlfw_MouseButtonCallback(GLFWwindow* window, int button, int action, int mods);
 | 
			
		||||
IMGUI_IMPL_API void     ImGui_ImplGlfw_ScrollCallback(GLFWwindow* window, double xoffset, double yoffset);
 | 
			
		||||
IMGUI_IMPL_API void     ImGui_ImplGlfw_KeyCallback(GLFWwindow* window, int key, int scancode, int action, int mods);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user