|FIX] : fix for ImGui 1.91 (WIP) (#192)

aiekick · Jul 22, 2024 · 9ab2b33 · 9ab2b33
1 parent 1d09cee
commit 9ab2b33
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/3rdparty/imgui b/3rdparty/imgui
diff --git a/3rdparty/imwidgets/ImWidgets.cpp b/3rdparty/imwidgets/ImWidgets.cpp
@@ -18,7 +18,7 @@
  */
 
 // ############################# DISCLAIMER #############################
-// ############ THIS WIDGTES LIB IS BASED ON IMGUIPACK ##################
+// ############ THIS WIDGETS LIB IS BASED ON IMGUIPACK ##################
 // ############# https://github.com/aiekick/ImGuiPack ###################
 // ######################################################################
 

diff --git a/3rdparty/imwidgets/ImWidgets.h b/3rdparty/imwidgets/ImWidgets.h
@@ -15,7 +15,7 @@
  */
 
 // ############################# DISCLAIMER ############################# 
-// ############ THIS WIDGTES LIB IS BASED ON IMGUIPACK ################## 
+// ############ THIS WIDGETS LIB IS BASED ON IMGUIPACK ################## 
 // ############# https://github.com/aiekick/ImGuiPack ###################
 // ######################################################################
 

diff --git a/DemoDialog.cpp b/DemoDialog.cpp
@@ -104,9 +104,9 @@ void ApplyOrangeBlueTheme() {
     style.Colors[ImGuiCol_ResizeGripActive]      = ImVec4(0.26f, 0.59f, 0.98f, 0.95f);
     style.Colors[ImGuiCol_Tab]                   = ImVec4(0.20f, 0.41f, 0.68f, 0.00f);
     style.Colors[ImGuiCol_TabHovered]            = ImVec4(0.26f, 0.59f, 0.98f, 0.80f);
-    style.Colors[ImGuiCol_TabActive]             = ImVec4(0.20f, 0.41f, 0.68f, 1.00f);
-    style.Colors[ImGuiCol_TabUnfocused]          = ImVec4(0.20f, 0.41f, 0.68f, 0.00f);
-    style.Colors[ImGuiCol_TabUnfocusedActive]    = ImVec4(0.20f, 0.41f, 0.68f, 1.00f);
+    style.Colors[ImGuiCol_TabSelected]           = ImVec4(0.20f, 0.41f, 0.68f, 1.00f);
+    style.Colors[ImGuiCol_TabDimmed]             = ImVec4(0.20f, 0.41f, 0.68f, 0.00f);
+    style.Colors[ImGuiCol_TabDimmedSelected]     = ImVec4(0.20f, 0.41f, 0.68f, 1.00f);
     style.Colors[ImGuiCol_PlotLines]             = ImVec4(0.61f, 0.61f, 0.61f, 1.00f);
     style.Colors[ImGuiCol_PlotLinesHovered]      = ImVec4(1.00f, 0.43f, 0.35f, 1.00f);
     style.Colors[ImGuiCol_PlotHistogram]         = ImVec4(0.13f, 0.52f, 0.94f, 0.95f);

diff --git a/ImGuiFileDialog b/ImGuiFileDialog
+1 −1		.github/FUNDING.yml
+2 −2		.github/workflows/build.yml
+3 −1		.gitignore
+6 −4		backends/imgui_impl_allegro5.cpp
+2 −0		backends/imgui_impl_android.cpp
+2 −1		backends/imgui_impl_dx10.cpp
+2 −1		backends/imgui_impl_dx11.cpp
+2 −1		backends/imgui_impl_dx12.cpp
+2 −1		backends/imgui_impl_dx9.cpp
+59 −27		backends/imgui_impl_glfw.cpp
+3 −2		backends/imgui_impl_glfw.h
+1 −0		backends/imgui_impl_glut.cpp
+5 −3		backends/imgui_impl_metal.mm
+5 −1		backends/imgui_impl_opengl2.cpp
+29 −24		backends/imgui_impl_opengl3.cpp
+3 −3		backends/imgui_impl_opengl3.h
+110 −16		backends/imgui_impl_opengl3_loader.h
+13 −6		backends/imgui_impl_osx.mm
+32 −15		backends/imgui_impl_sdl2.cpp
+135 −97		backends/imgui_impl_sdl3.cpp
+2 −3		backends/imgui_impl_sdl3.h
+21 −23		backends/imgui_impl_sdlrenderer2.cpp
+1 −1		backends/imgui_impl_sdlrenderer2.h
+45 −24		backends/imgui_impl_sdlrenderer3.cpp
+1 −1		backends/imgui_impl_sdlrenderer3.h
+12 −9		backends/imgui_impl_vulkan.cpp
+9 −2		backends/imgui_impl_vulkan.h
+2 −1		backends/imgui_impl_wgpu.cpp
+51 −29		backends/imgui_impl_win32.cpp
+2 −2		docs/BACKENDS.md
+431 −10		docs/CHANGELOG.txt
+4 −4		docs/EXAMPLES.md
+36 −4		docs/FAQ.md
+3 −3		docs/README.md
+8 −10		docs/TODO.txt
+1 −1		examples/example_android_opengl3/main.cpp
+1 −1		examples/example_glfw_opengl3/main.cpp
+24 −17		examples/example_glfw_vulkan/main.cpp
+113 −0		examples/example_glfw_wgpu/CMakeLists.txt
+0 −0		examples/example_glfw_wgpu/Makefile.emscripten
+2 −2		examples/example_glfw_wgpu/README.md
+83 −19		examples/example_glfw_wgpu/main.cpp
+5 −1		examples/example_glfw_wgpu/web/index.html
+1 −1		examples/example_sdl2_sdlrenderer2/main.cpp
+24 −17		examples/example_sdl2_vulkan/main.cpp
+3 −3		examples/example_sdl3_opengl3/Makefile
+1 −4		examples/example_sdl3_opengl3/main.cpp
+3 −3		examples/example_sdl3_sdlrenderer3/Makefile
+4 −6		examples/example_sdl3_sdlrenderer3/main.cpp
+14 −2		examples/example_win32_directx10/main.cpp
+13 −2		examples/example_win32_directx11/main.cpp
+15 −2		examples/example_win32_directx12/main.cpp
+18 −4		examples/example_win32_directx9/main.cpp
+20 −0		examples/imgui_examples.sln
+1 −1		examples/libs/usynergy/uSynergy.h
+9 −4		imconfig.h
+990 −487		imgui.cpp
+481 −165		imgui.h
+1,933 −403		imgui_demo.cpp
+28 −15		imgui_draw.cpp
+368 −240		imgui_internal.h
+101 −49		imgui_tables.cpp
+1,370 −212		imgui_widgets.cpp
+1 −1		imstb_textedit.h
+1 −1		imstb_truetype.h
+2 −2		misc/freetype/imgui_freetype.cpp