update ImGui to 1.90.5

wootguy · Apr 24, 2024 · dbbe0af · dbbe0af
1 parent 7ba271c
commit dbbe0af
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -199,7 +199,7 @@ if(MSVC)
 													src/util/lodepng.cpp)
 
 else()
-	target_link_libraries(${PROJECT_NAME} GL GLU X11 Xxf86vm Xrandr pthread Xi GLEW stdc++fs)
+	target_link_libraries(${PROJECT_NAME} GL GLU X11 Xxf86vm Xrandr pthread Xi GLEW stdc++fs ${CMAKE_DL_LIBS})
 	set(CMAKE_CXX_FLAGS "-Wall -std=c++11")
 	set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
 	set(CMAKE_CXX_FLAGS_RELEASE "-Os -fno-exceptions -w -Wfatal-errors")

diff --git a/imgui b/imgui
diff --git a/src/editor/Gui.cpp b/src/editor/Gui.cpp
@@ -3283,7 +3283,8 @@ void Gui::drawEntityReport() {
 			static vector<int> visibleEnts;
 			static vector<bool> selectedItems;
 
-			const ImGuiKeyModFlags expected_key_mod_flags = ImGui::GetMergedKeyModFlags();
+			ImGuiIO& io = ImGui::GetIO();
+			const ImGuiModFlags expected_key_mod_flags = io.KeyMods;
 
 			int footerHeight = ImGui::GetFrameHeightWithSpacing() * 5 + 16;
 			ImGui::BeginChild("entlist", ImVec2(0, -footerHeight));
@@ -3371,11 +3372,11 @@ void Gui::drawEntityReport() {
 					string cname = ent->keyvalues["classname"];
 
 					if (ImGui::Selectable((cname + "##ent" + to_string(i)).c_str(), selectedItems[i], ImGuiSelectableFlags_AllowDoubleClick)) {
-						if (expected_key_mod_flags & ImGuiKeyModFlags_Ctrl) {
+						if (expected_key_mod_flags & ImGuiModFlags_Ctrl) {
 							selectedItems[i] = !selectedItems[i];
 							lastSelect = i;
 						}
-						else if (expected_key_mod_flags & ImGuiKeyModFlags_Shift) {
+						else if (expected_key_mod_flags & ImGuiModFlags_Shift) {
 							if (lastSelect >= 0) {
 								int begin = i > lastSelect ? lastSelect : i;
 								int end = i > lastSelect ? i : lastSelect;