Compatibility with new ImGui

Fixitdaz · Dec 13, 2020 · 3c1bd41 · 3c1bd41
1 parent 9834dc6
commit 3c1bd41
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -74,10 +74,10 @@ if(ENABLE_GLES2)
 endif()
 
 # workaround for OpenGL include for OpenGL2, need to be glad rather than gl itself
-file(READ "${CMAKE_CURRENT_SOURCE_DIR}/imgui/examples/imgui_impl_opengl2.cpp" input)
+file(READ "${CMAKE_CURRENT_SOURCE_DIR}/imgui/backends/imgui_impl_opengl2.cpp" input)
 string(REPLACE "OpenGL/gl.h" "glad/glad.h" input "${input}")
 string(REPLACE "GL/gl.h" "glad/glad.h" input "${input}")
-file(WRITE "${CMAKE_CURRENT_SOURCE_DIR}/imgui/examples/imgui_impl_opengl2.cpp" "${input}")
+file(WRITE "${CMAKE_CURRENT_SOURCE_DIR}/imgui/backends/imgui_impl_opengl2.cpp" "${input}")
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/imgui
 	${GLAD_INCLUDE_DIRS}
@@ -86,19 +86,20 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/imgui
 set(SOURCES
 	imgui/imgui.cpp
 	imgui/imgui_draw.cpp
+	imgui/imgui_tables.cpp
 	imgui/imgui_widgets.cpp
 	imgui/misc/cpp/imgui_stdlib.cpp
-	imgui/examples/imgui_impl_sdl.cpp)
+	imgui/backends/imgui_impl_sdl.cpp)
 
 
 if(ENABLE_GL1)
 	LIST(APPEND SOURCES
-		imgui/examples/imgui_impl_opengl2.cpp
+		imgui/backends/imgui_impl_opengl2.cpp
 	)
 endif()
 if(ENABLE_GL3)
 	LIST(APPEND SOURCES
-		imgui/examples/imgui_impl_opengl3.cpp
+		imgui/backends/imgui_impl_opengl3.cpp
 	)
 endif()
 

diff --git a/src/openboardview/GUI/Preferences/Keyboard.cpp b/src/openboardview/GUI/Preferences/Keyboard.cpp
@@ -30,7 +30,7 @@ void Keyboard::render() {
 		auto colcount = 1 + (maxbindings != keybindings.keybindings.end() ? maxbindings->second.size() : 0) + 1;
 
 		if (ImGui::BeginTable("KeyBindings", colcount,
-			ImGuiTableFlags_SizingPolicyFixedX // size according to content
+			ImGuiTableFlags_ColumnsWidthFixed // size according to content
 			| ImGuiTableFlags_RowBg // alternating background colors
 			| ImGuiTableFlags_BordersH
 			| ImGuiTableFlags_BordersV)) {

diff --git a/src/openboardview/Renderers/ImGuiRendererSDL.cpp b/src/openboardview/Renderers/ImGuiRendererSDL.cpp
@@ -5,7 +5,7 @@
 #define STB_IMAGE_IMPLEMENTATION
 #include <stb_image.h>
 
-#include "imgui_impl_sdl.h"
+#include "backends/imgui_impl_sdl.h"
 
 ImGuiRendererSDL::ImGuiRendererSDL(SDL_Window *window) : window(window) {
 	SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);

diff --git a/src/openboardview/Renderers/ImGuiRendererSDLGL1.cpp b/src/openboardview/Renderers/ImGuiRendererSDLGL1.cpp
@@ -1,6 +1,6 @@
 #include "ImGuiRendererSDLGL1.h"
 
-#include "imgui_impl_opengl2.h"
+#include "backends/imgui_impl_opengl2.h"
 
 std::string ImGuiRendererSDLGL1::name() {
     return "ImGuiRendererSDLGL1";

diff --git a/src/openboardview/Renderers/ImGuiRendererSDLGL3.cpp b/src/openboardview/Renderers/ImGuiRendererSDLGL3.cpp
@@ -1,6 +1,6 @@
 #include "ImGuiRendererSDLGL3.h"
 
-#include "imgui_impl_opengl3.h"
+#include "backends/imgui_impl_opengl3.h"
 
 std::string ImGuiRendererSDLGL3::name() {
     return "ImGuiRendererSDLGL3";