Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-07-05 04:28:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Renamed ImGuiStyleVar_Count_ to ImGuiStyleVar_COUNT for consistency with other enums. Added

Browse Source
This commit is contained in:
omar
2018-03-03 20:15:10 +01:00
parent 8a4093f38b
commit 69e700f869
15 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/directx10_example/imgui_impl_dx10.cpp
View File

@ -37,7 +37,7 @@
static HWND g_hWnd = 0;
static INT64 g_Time = 0;
static INT64 g_TicksPerSecond = 0;
static ImGuiMouseCursor g_LastMouseCursor = ImGuiMouseCursor_Count_;
static ImGuiMouseCursor g_LastMouseCursor = ImGuiMouseCursor_COUNT;
// DirectX data
static ID3D10Device* g_pd3dDevice = NULL;

2
examples/directx11_example/imgui_impl_dx11.cpp
View File

@ -36,7 +36,7 @@
static HWND g_hWnd = 0;
static INT64 g_Time = 0;
static INT64 g_TicksPerSecond = 0;
static ImGuiMouseCursor g_LastMouseCursor = ImGuiMouseCursor_Count_;
static ImGuiMouseCursor g_LastMouseCursor = ImGuiMouseCursor_COUNT;
// DirectX data
static ID3D11Device* g_pd3dDevice = NULL;

2
examples/directx12_example/imgui_impl_dx12.cpp
View File

@ -24,7 +24,7 @@
static HWND g_hWnd = 0;
static INT64 g_Time = 0;
static INT64 g_TicksPerSecond = 0;
static ImGuiMouseCursor g_LastMouseCursor = ImGuiMouseCursor_Count_;
static ImGuiMouseCursor g_LastMouseCursor = ImGuiMouseCursor_COUNT;
// DirectX data
static ID3D12Device* g_pd3dDevice = NULL;

2
examples/directx9_example/imgui_impl_dx9.cpp
View File

@ -27,7 +27,7 @@
static HWND g_hWnd = 0;
static INT64 g_Time = 0;
static INT64 g_TicksPerSecond = 0;
static ImGuiMouseCursor g_LastMouseCursor = ImGuiMouseCursor_Count_;
static ImGuiMouseCursor g_LastMouseCursor = ImGuiMouseCursor_COUNT;
// DirectX data
static LPDIRECT3DDEVICE9 g_pd3dDevice = NULL;

4
examples/opengl2_example/imgui_impl_glfw_gl2.cpp
View File

@ -50,7 +50,7 @@
static GLFWwindow* g_Window = NULL;
static double g_Time = 0.0f;
static bool g_MouseJustPressed[3] = { false, false, false };
static GLFWcursor* g_MouseCursors[ImGuiMouseCursor_Count_] = { 0 };
static GLFWcursor* g_MouseCursors[ImGuiMouseCursor_COUNT] = { 0 };
// OpenGL data
static GLuint g_FontTexture = 0;
@ -282,7 +282,7 @@ bool ImGui_ImplGlfwGL2_Init(GLFWwindow* window, bool install_callbacks)
void ImGui_ImplGlfwGL2_Shutdown()
{
// Destroy GLFW mouse cursors
for (ImGuiMouseCursor cursor_n = 0; cursor_n < ImGuiMouseCursor_Count_; cursor_n++)
for (ImGuiMouseCursor cursor_n = 0; cursor_n < ImGuiMouseCursor_COUNT; cursor_n++)
glfwDestroyCursor(g_MouseCursors[cursor_n]);
memset(g_MouseCursors, 0, sizeof(g_MouseCursors));

4
examples/opengl3_example/imgui_impl_glfw_gl3.cpp
View File

@ -48,7 +48,7 @@
static GLFWwindow* g_Window = NULL;
static double g_Time = 0.0f;
static bool g_MouseJustPressed[3] = { false, false, false };
static GLFWcursor* g_MouseCursors[ImGuiMouseCursor_Count_] = { 0 };
static GLFWcursor* g_MouseCursors[ImGuiMouseCursor_COUNT] = { 0 };
// OpenGL3 data
static GLuint g_FontTexture = 0;
@ -400,7 +400,7 @@ bool ImGui_ImplGlfwGL3_Init(GLFWwindow* window, bool install_callbacks)
void ImGui_ImplGlfwGL3_Shutdown()
{
// Destroy GLFW mouse cursors
for (ImGuiMouseCursor cursor_n = 0; cursor_n < ImGuiMouseCursor_Count_; cursor_n++)
for (ImGuiMouseCursor cursor_n = 0; cursor_n < ImGuiMouseCursor_COUNT; cursor_n++)
glfwDestroyCursor(g_MouseCursors[cursor_n]);
memset(g_MouseCursors, 0, sizeof(g_MouseCursors));

4
examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
View File

@ -44,7 +44,7 @@
static Uint64 g_Time = 0;
static bool g_MousePressed[3] = { false, false, false };
static GLuint g_FontTexture = 0;
static SDL_Cursor* g_MouseCursors[ImGuiMouseCursor_Count_] = { 0 };
static SDL_Cursor* g_MouseCursors[ImGuiMouseCursor_COUNT] = { 0 };
// OpenGL2 Render function.
// (this used to be set in io.RenderDrawListsFn and called by ImGui::Render(), but you can now call this directly from your main loop)
@ -275,7 +275,7 @@ bool ImGui_ImplSdlGL2_Init(SDL_Window* window)
void ImGui_ImplSdlGL2_Shutdown()
{
// Destroy SDL mouse cursors
for (ImGuiMouseCursor cursor_n = 0; cursor_n < ImGuiMouseCursor_Count_; cursor_n++)
for (ImGuiMouseCursor cursor_n = 0; cursor_n < ImGuiMouseCursor_COUNT; cursor_n++)
SDL_FreeCursor(g_MouseCursors[cursor_n]);
memset(g_MouseCursors, 0, sizeof(g_MouseCursors));

4
examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
View File

@ -42,7 +42,7 @@
// SDL data
static Uint64 g_Time = 0;
static bool g_MousePressed[3] = { false, false, false };
static SDL_Cursor* g_MouseCursors[ImGuiMouseCursor_Count_] = { 0 };
static SDL_Cursor* g_MouseCursors[ImGuiMouseCursor_COUNT] = { 0 };
// OpenGL data
static GLuint g_FontTexture = 0;
@ -394,7 +394,7 @@ bool ImGui_ImplSdlGL3_Init(SDL_Window* window)
void ImGui_ImplSdlGL3_Shutdown()
{
// Destroy SDL mouse cursors
for (ImGuiMouseCursor cursor_n = 0; cursor_n < ImGuiMouseCursor_Count_; cursor_n++)
for (ImGuiMouseCursor cursor_n = 0; cursor_n < ImGuiMouseCursor_COUNT; cursor_n++)
SDL_FreeCursor(g_MouseCursors[cursor_n]);
memset(g_MouseCursors, 0, sizeof(g_MouseCursors));

4
examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
View File

@ -42,7 +42,7 @@
static GLFWwindow* g_Window = NULL;
static double g_Time = 0.0f;
static bool g_MouseJustPressed[3] = { false, false, false };
static GLFWcursor* g_MouseCursors[ImGuiMouseCursor_Count_] = { 0 };
static GLFWcursor* g_MouseCursors[ImGuiMouseCursor_COUNT] = { 0 };
// Vulkan data
static VkAllocationCallbacks* g_Allocator = NULL;
@ -820,7 +820,7 @@ bool ImGui_ImplGlfwVulkan_Init(GLFWwindow* window, bool install_callbacks, Im
void ImGui_ImplGlfwVulkan_Shutdown()
{
// Destroy GLFW mouse cursors
for (ImGuiMouseCursor cursor_n = 0; cursor_n < ImGuiMouseCursor_Count_; cursor_n++)
for (ImGuiMouseCursor cursor_n = 0; cursor_n < ImGuiMouseCursor_COUNT; cursor_n++)
glfwDestroyCursor(g_MouseCursors[cursor_n]);
memset(g_MouseCursors, 0, sizeof(g_MouseCursors));