Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-07-16 09:43:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking

Browse Source 
# Conflicts:
#	imgui.cpp
#	imgui.h
This commit is contained in:
omar
2019-02-14 20:35:11 +01:00
parent b46076458c 76dbff37cd
commit 09c9bf2edb
12 changed files with 788 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/imgui_impl_win32.cpp
View File

@ -204,7 +204,7 @@ static void ImGui_ImplWin32_UpdateMousePos()
#endif
// Gamepad navigation mapping
void ImGui_ImplWin32_UpdateGameControllers()
static void ImGui_ImplWin32_UpdateGamepads()
{
ImGuiIO& io = ImGui::GetIO();
memset(io.NavInputs, 0, sizeof(io.NavInputs));
@ -287,7 +287,7 @@ void ImGui_ImplWin32_NewFrame()
}
// Update game controllers (if available)
ImGui_ImplWin32_UpdateGameControllers();
ImGui_ImplWin32_UpdateGamepads();
}
// Allow compilation with old Windows SDK. MinGW doesn't have default _WIN32_WINNT/WINVER versions.