mirror of
				https://github.com/Drezil/imgui.git
				synced 2025-10-31 13:11:05 +01:00 
			
		
		
		
	Backends: moved global to a data structure to facilitate support for multi-contexts. (#586, #1851, #2004, #3012, #3934, #4141)
This is NOT enable multi-contexts for any backends - in order to make this commit as harmless as possible, while containing all the cruft/renaming -
This commit is contained in:
		| @@ -9,13 +9,14 @@ | ||||
| //  [X] Platform: Mouse cursor shape and visibility. Disable with 'io.ConfigFlags |= ImGuiConfigFlags_NoMouseCursorChange' (note: the resizing cursors requires GLFW 3.4+). | ||||
| //  [X] Platform: Keyboard arrays indexed using GLFW_KEY_* codes, e.g. ImGui::IsKeyPressed(GLFW_KEY_SPACE). | ||||
|  | ||||
| // You can use unmodified imgui_impl_* files in your project. See examples/ folder for examples of using this.  | ||||
| // You can use unmodified imgui_impl_* files in your project. See examples/ folder for examples of using this. | ||||
| // Prefer including the entire imgui/ repository into your project (either as a copy or as a submodule), and only build the backends you need. | ||||
| // If you are new to Dear ImGui, read documentation from the docs/ folder + read the top of imgui.cpp. | ||||
| // Read online: https://github.com/ocornut/imgui/tree/master/docs | ||||
|  | ||||
| // CHANGELOG | ||||
| // (minor and older changes stripped away, please see git history for details) | ||||
| //  2021-06-29: Reorganized backend to pull data from a single structure to facilitate usage with multiple-contexts (all g_XXXX access changed to bd->XXXX). | ||||
| //  2020-01-17: Inputs: Disable error callback while assigning mouse cursors because some X11 setup don't have them and it generates errors. | ||||
| //  2019-12-05: Inputs: Added support for new mouse cursors added in GLFW 3.4+ (resizing cursors, not allowed cursor). | ||||
| //  2019-10-18: Misc: Previously installed user callbacks are now restored on shutdown. | ||||
| @@ -59,26 +60,39 @@ | ||||
| #define GLFW_HAS_NEW_CURSORS          (0) | ||||
| #endif | ||||
|  | ||||
| // Data | ||||
| // GLFW data | ||||
| enum GlfwClientApi | ||||
| { | ||||
|     GlfwClientApi_Unknown, | ||||
|     GlfwClientApi_OpenGL, | ||||
|     GlfwClientApi_Vulkan | ||||
| }; | ||||
| static GLFWwindow*          g_Window = NULL;    // Main window | ||||
| static GlfwClientApi        g_ClientApi = GlfwClientApi_Unknown; | ||||
| static double               g_Time = 0.0; | ||||
| static bool                 g_MouseJustPressed[ImGuiMouseButton_COUNT] = {}; | ||||
| static GLFWcursor*          g_MouseCursors[ImGuiMouseCursor_COUNT] = {}; | ||||
| static bool                 g_InstalledCallbacks = false; | ||||
|  | ||||
| // Chain GLFW callbacks: our callbacks will call the user's previously installed callbacks, if any. | ||||
| static GLFWmousebuttonfun   g_PrevUserCallbackMousebutton = NULL; | ||||
| static GLFWscrollfun        g_PrevUserCallbackScroll = NULL; | ||||
| static GLFWkeyfun           g_PrevUserCallbackKey = NULL; | ||||
| static GLFWcharfun          g_PrevUserCallbackChar = NULL; | ||||
| struct ImGui_ImplGlfw_Data | ||||
| { | ||||
|     GLFWwindow*             Window; | ||||
|     GlfwClientApi           ClientApi; | ||||
|     double                  Time; | ||||
|     bool                    MouseJustPressed[ImGuiMouseButton_COUNT]; | ||||
|     GLFWcursor*             MouseCursors[ImGuiMouseCursor_COUNT]; | ||||
|     bool                    InstalledCallbacks; | ||||
|  | ||||
|     // Chain GLFW callbacks: our callbacks will call the user's previously installed callbacks, if any. | ||||
|     GLFWmousebuttonfun      PrevUserCallbackMousebutton; | ||||
|     GLFWscrollfun           PrevUserCallbackScroll; | ||||
|     GLFWkeyfun              PrevUserCallbackKey; | ||||
|     GLFWcharfun             PrevUserCallbackChar; | ||||
|  | ||||
|     ImGui_ImplGlfw_Data()   { memset(this, 0, sizeof(*this)); } | ||||
| }; | ||||
|  | ||||
| // Wrapping access to backend data (to facilitate multiple-contexts stored in io.BackendPlatformUserData) | ||||
| static ImGui_ImplGlfw_Data* g_Data; | ||||
| static ImGui_ImplGlfw_Data* ImGui_ImplGlfw_CreateBackendData()  { IM_ASSERT(g_Data == NULL); g_Data = IM_NEW(ImGui_ImplGlfw_Data); return g_Data; } | ||||
| static ImGui_ImplGlfw_Data* ImGui_ImplGlfw_GetBackendData()     { return ImGui::GetCurrentContext() != NULL ? g_Data : NULL; } | ||||
| static void                 ImGui_ImplGlfw_DestroyBackendData() { IM_DELETE(g_Data); g_Data = NULL; } | ||||
|  | ||||
| // Functions | ||||
| static const char* ImGui_ImplGlfw_GetClipboardText(void* user_data) | ||||
| { | ||||
|     return glfwGetClipboardString((GLFWwindow*)user_data); | ||||
| @@ -91,17 +105,19 @@ static void ImGui_ImplGlfw_SetClipboardText(void* user_data, const char* text) | ||||
|  | ||||
| void ImGui_ImplGlfw_MouseButtonCallback(GLFWwindow* window, int button, int action, int mods) | ||||
| { | ||||
|     if (g_PrevUserCallbackMousebutton != NULL) | ||||
|         g_PrevUserCallbackMousebutton(window, button, action, mods); | ||||
|     ImGui_ImplGlfw_Data* bd = ImGui_ImplGlfw_GetBackendData(); | ||||
|     if (bd->PrevUserCallbackMousebutton != NULL) | ||||
|         bd->PrevUserCallbackMousebutton(window, button, action, mods); | ||||
|  | ||||
|     if (action == GLFW_PRESS && button >= 0 && button < IM_ARRAYSIZE(g_MouseJustPressed)) | ||||
|         g_MouseJustPressed[button] = true; | ||||
|     if (action == GLFW_PRESS && button >= 0 && button < IM_ARRAYSIZE(bd->MouseJustPressed)) | ||||
|         bd->MouseJustPressed[button] = true; | ||||
| } | ||||
|  | ||||
| void ImGui_ImplGlfw_ScrollCallback(GLFWwindow* window, double xoffset, double yoffset) | ||||
| { | ||||
|     if (g_PrevUserCallbackScroll != NULL) | ||||
|         g_PrevUserCallbackScroll(window, xoffset, yoffset); | ||||
|     ImGui_ImplGlfw_Data* bd = ImGui_ImplGlfw_GetBackendData(); | ||||
|     if (bd->PrevUserCallbackScroll != NULL) | ||||
|         bd->PrevUserCallbackScroll(window, xoffset, yoffset); | ||||
|  | ||||
|     ImGuiIO& io = ImGui::GetIO(); | ||||
|     io.MouseWheelH += (float)xoffset; | ||||
| @@ -110,8 +126,9 @@ void ImGui_ImplGlfw_ScrollCallback(GLFWwindow* window, double xoffset, double yo | ||||
|  | ||||
| void ImGui_ImplGlfw_KeyCallback(GLFWwindow* window, int key, int scancode, int action, int mods) | ||||
| { | ||||
|     if (g_PrevUserCallbackKey != NULL) | ||||
|         g_PrevUserCallbackKey(window, key, scancode, action, mods); | ||||
|     ImGui_ImplGlfw_Data* bd = ImGui_ImplGlfw_GetBackendData(); | ||||
|     if (bd->PrevUserCallbackKey != NULL) | ||||
|         bd->PrevUserCallbackKey(window, key, scancode, action, mods); | ||||
|  | ||||
|     ImGuiIO& io = ImGui::GetIO(); | ||||
|     if (key >= 0 && key < IM_ARRAYSIZE(io.KeysDown)) | ||||
| @@ -135,8 +152,9 @@ void ImGui_ImplGlfw_KeyCallback(GLFWwindow* window, int key, int scancode, int a | ||||
|  | ||||
| void ImGui_ImplGlfw_CharCallback(GLFWwindow* window, unsigned int c) | ||||
| { | ||||
|     if (g_PrevUserCallbackChar != NULL) | ||||
|         g_PrevUserCallbackChar(window, c); | ||||
|     ImGui_ImplGlfw_Data* bd = ImGui_ImplGlfw_GetBackendData(); | ||||
|     if (bd->PrevUserCallbackChar != NULL) | ||||
|         bd->PrevUserCallbackChar(window, c); | ||||
|  | ||||
|     ImGuiIO& io = ImGui::GetIO(); | ||||
|     io.AddInputCharacter(c); | ||||
| @@ -144,14 +162,18 @@ void ImGui_ImplGlfw_CharCallback(GLFWwindow* window, unsigned int c) | ||||
|  | ||||
| static bool ImGui_ImplGlfw_Init(GLFWwindow* window, bool install_callbacks, GlfwClientApi client_api) | ||||
| { | ||||
|     g_Window = window; | ||||
|     g_Time = 0.0; | ||||
|     ImGuiIO& io = ImGui::GetIO(); | ||||
|     IM_ASSERT(io.BackendPlatformUserData == NULL && "Already initialized a platform backend!"); | ||||
|  | ||||
|     ImGui_ImplGlfw_Data* bd = ImGui_ImplGlfw_CreateBackendData(); | ||||
|     bd->Window = window; | ||||
|     bd->Time = 0.0; | ||||
|  | ||||
|     // Setup backend capabilities flags | ||||
|     ImGuiIO& io = ImGui::GetIO(); | ||||
|     io.BackendPlatformUserData = (void*)bd; | ||||
|     io.BackendPlatformName = "imgui_impl_glfw"; | ||||
|     io.BackendFlags |= ImGuiBackendFlags_HasMouseCursors;         // We can honor GetMouseCursor() values (optional) | ||||
|     io.BackendFlags |= ImGuiBackendFlags_HasSetMousePos;          // We can honor io.WantSetMousePos requests (optional, rarely used) | ||||
|     io.BackendPlatformName = "imgui_impl_glfw"; | ||||
|  | ||||
|     // Keyboard mapping. Dear ImGui will use those indices to peek into the io.KeysDown[] array. | ||||
|     io.KeyMap[ImGuiKey_Tab] = GLFW_KEY_TAB; | ||||
| @@ -179,9 +201,9 @@ static bool ImGui_ImplGlfw_Init(GLFWwindow* window, bool install_callbacks, Glfw | ||||
|  | ||||
|     io.SetClipboardTextFn = ImGui_ImplGlfw_SetClipboardText; | ||||
|     io.GetClipboardTextFn = ImGui_ImplGlfw_GetClipboardText; | ||||
|     io.ClipboardUserData = g_Window; | ||||
|     io.ClipboardUserData = bd->Window; | ||||
| #if defined(_WIN32) | ||||
|     io.ImeWindowHandle = (void*)glfwGetWin32Window(g_Window); | ||||
|     io.ImeWindowHandle = (void*)glfwGetWin32Window(bd->Window); | ||||
| #endif | ||||
|  | ||||
|     // Create mouse cursors | ||||
| @@ -189,39 +211,39 @@ static bool ImGui_ImplGlfw_Init(GLFWwindow* window, bool install_callbacks, Glfw | ||||
|     // GLFW will emit an error which will often be printed by the app, so we temporarily disable error reporting. | ||||
|     // Missing cursors will return NULL and our _UpdateMouseCursor() function will use the Arrow cursor instead.) | ||||
|     GLFWerrorfun prev_error_callback = glfwSetErrorCallback(NULL); | ||||
|     g_MouseCursors[ImGuiMouseCursor_Arrow] = glfwCreateStandardCursor(GLFW_ARROW_CURSOR); | ||||
|     g_MouseCursors[ImGuiMouseCursor_TextInput] = glfwCreateStandardCursor(GLFW_IBEAM_CURSOR); | ||||
|     g_MouseCursors[ImGuiMouseCursor_ResizeNS] = glfwCreateStandardCursor(GLFW_VRESIZE_CURSOR); | ||||
|     g_MouseCursors[ImGuiMouseCursor_ResizeEW] = glfwCreateStandardCursor(GLFW_HRESIZE_CURSOR); | ||||
|     g_MouseCursors[ImGuiMouseCursor_Hand] = glfwCreateStandardCursor(GLFW_HAND_CURSOR); | ||||
|     bd->MouseCursors[ImGuiMouseCursor_Arrow] = glfwCreateStandardCursor(GLFW_ARROW_CURSOR); | ||||
|     bd->MouseCursors[ImGuiMouseCursor_TextInput] = glfwCreateStandardCursor(GLFW_IBEAM_CURSOR); | ||||
|     bd->MouseCursors[ImGuiMouseCursor_ResizeNS] = glfwCreateStandardCursor(GLFW_VRESIZE_CURSOR); | ||||
|     bd->MouseCursors[ImGuiMouseCursor_ResizeEW] = glfwCreateStandardCursor(GLFW_HRESIZE_CURSOR); | ||||
|     bd->MouseCursors[ImGuiMouseCursor_Hand] = glfwCreateStandardCursor(GLFW_HAND_CURSOR); | ||||
| #if GLFW_HAS_NEW_CURSORS | ||||
|     g_MouseCursors[ImGuiMouseCursor_ResizeAll] = glfwCreateStandardCursor(GLFW_RESIZE_ALL_CURSOR); | ||||
|     g_MouseCursors[ImGuiMouseCursor_ResizeNESW] = glfwCreateStandardCursor(GLFW_RESIZE_NESW_CURSOR); | ||||
|     g_MouseCursors[ImGuiMouseCursor_ResizeNWSE] = glfwCreateStandardCursor(GLFW_RESIZE_NWSE_CURSOR); | ||||
|     g_MouseCursors[ImGuiMouseCursor_NotAllowed] = glfwCreateStandardCursor(GLFW_NOT_ALLOWED_CURSOR); | ||||
|     bd->MouseCursors[ImGuiMouseCursor_ResizeAll] = glfwCreateStandardCursor(GLFW_RESIZE_ALL_CURSOR); | ||||
|     bd->MouseCursors[ImGuiMouseCursor_ResizeNESW] = glfwCreateStandardCursor(GLFW_RESIZE_NESW_CURSOR); | ||||
|     bd->MouseCursors[ImGuiMouseCursor_ResizeNWSE] = glfwCreateStandardCursor(GLFW_RESIZE_NWSE_CURSOR); | ||||
|     bd->MouseCursors[ImGuiMouseCursor_NotAllowed] = glfwCreateStandardCursor(GLFW_NOT_ALLOWED_CURSOR); | ||||
| #else | ||||
|     g_MouseCursors[ImGuiMouseCursor_ResizeAll] = glfwCreateStandardCursor(GLFW_ARROW_CURSOR); | ||||
|     g_MouseCursors[ImGuiMouseCursor_ResizeNESW] = glfwCreateStandardCursor(GLFW_ARROW_CURSOR); | ||||
|     g_MouseCursors[ImGuiMouseCursor_ResizeNWSE] = glfwCreateStandardCursor(GLFW_ARROW_CURSOR); | ||||
|     g_MouseCursors[ImGuiMouseCursor_NotAllowed] = glfwCreateStandardCursor(GLFW_ARROW_CURSOR); | ||||
|     bd->MouseCursors[ImGuiMouseCursor_ResizeAll] = glfwCreateStandardCursor(GLFW_ARROW_CURSOR); | ||||
|     bd->MouseCursors[ImGuiMouseCursor_ResizeNESW] = glfwCreateStandardCursor(GLFW_ARROW_CURSOR); | ||||
|     bd->MouseCursors[ImGuiMouseCursor_ResizeNWSE] = glfwCreateStandardCursor(GLFW_ARROW_CURSOR); | ||||
|     bd->MouseCursors[ImGuiMouseCursor_NotAllowed] = glfwCreateStandardCursor(GLFW_ARROW_CURSOR); | ||||
| #endif | ||||
|     glfwSetErrorCallback(prev_error_callback); | ||||
|  | ||||
|     // Chain GLFW callbacks: our callbacks will call the user's previously installed callbacks, if any. | ||||
|     g_PrevUserCallbackMousebutton = NULL; | ||||
|     g_PrevUserCallbackScroll = NULL; | ||||
|     g_PrevUserCallbackKey = NULL; | ||||
|     g_PrevUserCallbackChar = NULL; | ||||
|     bd->PrevUserCallbackMousebutton = NULL; | ||||
|     bd->PrevUserCallbackScroll = NULL; | ||||
|     bd->PrevUserCallbackKey = NULL; | ||||
|     bd->PrevUserCallbackChar = NULL; | ||||
|     if (install_callbacks) | ||||
|     { | ||||
|         g_InstalledCallbacks = true; | ||||
|         g_PrevUserCallbackMousebutton = glfwSetMouseButtonCallback(window, ImGui_ImplGlfw_MouseButtonCallback); | ||||
|         g_PrevUserCallbackScroll = glfwSetScrollCallback(window, ImGui_ImplGlfw_ScrollCallback); | ||||
|         g_PrevUserCallbackKey = glfwSetKeyCallback(window, ImGui_ImplGlfw_KeyCallback); | ||||
|         g_PrevUserCallbackChar = glfwSetCharCallback(window, ImGui_ImplGlfw_CharCallback); | ||||
|         bd->InstalledCallbacks = true; | ||||
|         bd->PrevUserCallbackMousebutton = glfwSetMouseButtonCallback(window, ImGui_ImplGlfw_MouseButtonCallback); | ||||
|         bd->PrevUserCallbackScroll = glfwSetScrollCallback(window, ImGui_ImplGlfw_ScrollCallback); | ||||
|         bd->PrevUserCallbackKey = glfwSetKeyCallback(window, ImGui_ImplGlfw_KeyCallback); | ||||
|         bd->PrevUserCallbackChar = glfwSetCharCallback(window, ImGui_ImplGlfw_CharCallback); | ||||
|     } | ||||
|  | ||||
|     g_ClientApi = client_api; | ||||
|     bd->ClientApi = client_api; | ||||
|     return true; | ||||
| } | ||||
|  | ||||
| @@ -242,32 +264,40 @@ bool ImGui_ImplGlfw_InitForOther(GLFWwindow* window, bool install_callbacks) | ||||
|  | ||||
| void ImGui_ImplGlfw_Shutdown() | ||||
| { | ||||
|     if (g_InstalledCallbacks) | ||||
|     ImGuiIO& io = ImGui::GetIO(); | ||||
|     ImGui_ImplGlfw_Data* bd = ImGui_ImplGlfw_GetBackendData(); | ||||
|  | ||||
|     if (bd->InstalledCallbacks) | ||||
|     { | ||||
|         glfwSetMouseButtonCallback(g_Window, g_PrevUserCallbackMousebutton); | ||||
|         glfwSetScrollCallback(g_Window, g_PrevUserCallbackScroll); | ||||
|         glfwSetKeyCallback(g_Window, g_PrevUserCallbackKey); | ||||
|         glfwSetCharCallback(g_Window, g_PrevUserCallbackChar); | ||||
|         g_InstalledCallbacks = false; | ||||
|         glfwSetMouseButtonCallback(bd->Window, bd->PrevUserCallbackMousebutton); | ||||
|         glfwSetScrollCallback(bd->Window, bd->PrevUserCallbackScroll); | ||||
|         glfwSetKeyCallback(bd->Window, bd->PrevUserCallbackKey); | ||||
|         glfwSetCharCallback(bd->Window, bd->PrevUserCallbackChar); | ||||
|         bd->InstalledCallbacks = false; | ||||
|     } | ||||
|  | ||||
|     for (ImGuiMouseCursor cursor_n = 0; cursor_n < ImGuiMouseCursor_COUNT; cursor_n++) | ||||
|     { | ||||
|         glfwDestroyCursor(g_MouseCursors[cursor_n]); | ||||
|         g_MouseCursors[cursor_n] = NULL; | ||||
|         glfwDestroyCursor(bd->MouseCursors[cursor_n]); | ||||
|         bd->MouseCursors[cursor_n] = NULL; | ||||
|     } | ||||
|     g_ClientApi = GlfwClientApi_Unknown; | ||||
|  | ||||
|     io.BackendPlatformName = NULL; | ||||
|     io.BackendPlatformUserData = NULL; | ||||
|     ImGui_ImplGlfw_DestroyBackendData(); | ||||
| } | ||||
|  | ||||
| static void ImGui_ImplGlfw_UpdateMousePosAndButtons() | ||||
| { | ||||
|     ImGui_ImplGlfw_Data* bd = ImGui_ImplGlfw_GetBackendData(); | ||||
|  | ||||
|     // Update buttons | ||||
|     ImGuiIO& io = ImGui::GetIO(); | ||||
|     for (int i = 0; i < IM_ARRAYSIZE(io.MouseDown); i++) | ||||
|     { | ||||
|         // If a mouse press event came, always pass it as "mouse held this frame", so we don't miss click-release events that are shorter than 1 frame. | ||||
|         io.MouseDown[i] = g_MouseJustPressed[i] || glfwGetMouseButton(g_Window, i) != 0; | ||||
|         g_MouseJustPressed[i] = false; | ||||
|         io.MouseDown[i] = bd->MouseJustPressed[i] || glfwGetMouseButton(bd->Window, i) != 0; | ||||
|         bd->MouseJustPressed[i] = false; | ||||
|     } | ||||
|  | ||||
|     // Update mouse position | ||||
| @@ -276,18 +306,18 @@ static void ImGui_ImplGlfw_UpdateMousePosAndButtons() | ||||
| #ifdef __EMSCRIPTEN__ | ||||
|     const bool focused = true; // Emscripten | ||||
| #else | ||||
|     const bool focused = glfwGetWindowAttrib(g_Window, GLFW_FOCUSED) != 0; | ||||
|     const bool focused = glfwGetWindowAttrib(bd->Window, GLFW_FOCUSED) != 0; | ||||
| #endif | ||||
|     if (focused) | ||||
|     { | ||||
|         if (io.WantSetMousePos) | ||||
|         { | ||||
|             glfwSetCursorPos(g_Window, (double)mouse_pos_backup.x, (double)mouse_pos_backup.y); | ||||
|             glfwSetCursorPos(bd->Window, (double)mouse_pos_backup.x, (double)mouse_pos_backup.y); | ||||
|         } | ||||
|         else | ||||
|         { | ||||
|             double mouse_x, mouse_y; | ||||
|             glfwGetCursorPos(g_Window, &mouse_x, &mouse_y); | ||||
|             glfwGetCursorPos(bd->Window, &mouse_x, &mouse_y); | ||||
|             io.MousePos = ImVec2((float)mouse_x, (float)mouse_y); | ||||
|         } | ||||
|     } | ||||
| @@ -296,21 +326,22 @@ static void ImGui_ImplGlfw_UpdateMousePosAndButtons() | ||||
| static void ImGui_ImplGlfw_UpdateMouseCursor() | ||||
| { | ||||
|     ImGuiIO& io = ImGui::GetIO(); | ||||
|     if ((io.ConfigFlags & ImGuiConfigFlags_NoMouseCursorChange) || glfwGetInputMode(g_Window, GLFW_CURSOR) == GLFW_CURSOR_DISABLED) | ||||
|     ImGui_ImplGlfw_Data* bd = ImGui_ImplGlfw_GetBackendData(); | ||||
|     if ((io.ConfigFlags & ImGuiConfigFlags_NoMouseCursorChange) || glfwGetInputMode(bd->Window, GLFW_CURSOR) == GLFW_CURSOR_DISABLED) | ||||
|         return; | ||||
|  | ||||
|     ImGuiMouseCursor imgui_cursor = ImGui::GetMouseCursor(); | ||||
|     if (imgui_cursor == ImGuiMouseCursor_None || io.MouseDrawCursor) | ||||
|     { | ||||
|         // Hide OS mouse cursor if imgui is drawing it or if it wants no cursor | ||||
|         glfwSetInputMode(g_Window, GLFW_CURSOR, GLFW_CURSOR_HIDDEN); | ||||
|         glfwSetInputMode(bd->Window, GLFW_CURSOR, GLFW_CURSOR_HIDDEN); | ||||
|     } | ||||
|     else | ||||
|     { | ||||
|         // Show OS mouse cursor | ||||
|         // FIXME-PLATFORM: Unfocused windows seems to fail changing the mouse cursor with GLFW 3.2, but 3.3 works here. | ||||
|         glfwSetCursor(g_Window, g_MouseCursors[imgui_cursor] ? g_MouseCursors[imgui_cursor] : g_MouseCursors[ImGuiMouseCursor_Arrow]); | ||||
|         glfwSetInputMode(g_Window, GLFW_CURSOR, GLFW_CURSOR_NORMAL); | ||||
|         glfwSetCursor(bd->Window, bd->MouseCursors[imgui_cursor] ? bd->MouseCursors[imgui_cursor] : bd->MouseCursors[ImGuiMouseCursor_Arrow]); | ||||
|         glfwSetInputMode(bd->Window, GLFW_CURSOR, GLFW_CURSOR_NORMAL); | ||||
|     } | ||||
| } | ||||
|  | ||||
| @@ -354,20 +385,21 @@ static void ImGui_ImplGlfw_UpdateGamepads() | ||||
| void ImGui_ImplGlfw_NewFrame() | ||||
| { | ||||
|     ImGuiIO& io = ImGui::GetIO(); | ||||
|     ImGui_ImplGlfw_Data* bd = ImGui_ImplGlfw_GetBackendData(); | ||||
|  | ||||
|     // Setup display size (every frame to accommodate for window resizing) | ||||
|     int w, h; | ||||
|     int display_w, display_h; | ||||
|     glfwGetWindowSize(g_Window, &w, &h); | ||||
|     glfwGetFramebufferSize(g_Window, &display_w, &display_h); | ||||
|     glfwGetWindowSize(bd->Window, &w, &h); | ||||
|     glfwGetFramebufferSize(bd->Window, &display_w, &display_h); | ||||
|     io.DisplaySize = ImVec2((float)w, (float)h); | ||||
|     if (w > 0 && h > 0) | ||||
|         io.DisplayFramebufferScale = ImVec2((float)display_w / w, (float)display_h / h); | ||||
|  | ||||
|     // Setup time step | ||||
|     double current_time = glfwGetTime(); | ||||
|     io.DeltaTime = g_Time > 0.0 ? (float)(current_time - g_Time) : (float)(1.0f / 60.0f); | ||||
|     g_Time = current_time; | ||||
|     io.DeltaTime = bd->Time > 0.0 ? (float)(current_time - bd->Time) : (float)(1.0f / 60.0f); | ||||
|     bd->Time = current_time; | ||||
|  | ||||
|     ImGui_ImplGlfw_UpdateMousePosAndButtons(); | ||||
|     ImGui_ImplGlfw_UpdateMouseCursor(); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user