mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2025-10-09 03:26:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking + fixes for #3259

Browse Source 
# Conflicts:
#	examples/example_glfw_vulkan/main.cpp
#	examples/example_sdl_vulkan/main.cpp
#	examples/imgui_impl_sdl.cpp
#	imgui.cpp
This commit is contained in:
ocornut
2020-05-25 18:32:15 +02:00
parent 0fe5170bc4 5ddf60d8ce
commit 5d472c4895
17 changed files with 195 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/imgui_impl_glfw.cpp
View File

@@ -74,7 +74,7 @@ enum GlfwClientApi
static GLFWwindow* g_Window = NULL; // Main window
static GlfwClientApi g_ClientApi = GlfwClientApi_Unknown;
static double g_Time = 0.0;
static bool g_MouseJustPressed[5] = { false, false, false, false, false };
static bool g_MouseJustPressed[ImGuiMouseButton_COUNT] = {};
static GLFWcursor* g_MouseCursors[ImGuiMouseCursor_COUNT] = {};
static bool g_InstalledCallbacks = false;
static bool g_WantUpdateMonitors = true;