From 801f02412c39d863abec3762e3697a5000c6812b Mon Sep 17 00:00:00 2001 From: FlightlessMango Date: Thu, 21 Sep 2023 22:02:56 +0200 Subject: [PATCH] imgui: update date to 1.89.9 --- meson.build | 2 +- src/overlay.cpp | 6 +++--- subprojects/imgui.wrap | 16 +++++++++------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/meson.build b/meson.build index 0b51043e..e6ba11ba 100644 --- a/meson.build +++ b/meson.build @@ -195,7 +195,6 @@ imgui_options = [ 'sdl2=disabled', 'osx=disabled', 'win=disabled', - 'marmalade=disabled', 'allegro5=disabled', ] @@ -241,6 +240,7 @@ endif if get_option('mangoapp') or get_option('mangoapp_layer') glfw3_dep = dependency('glfw3') + glew_dep = dependency('glew') endif json_dep = dependency('nlohmann_json') diff --git a/src/overlay.cpp b/src/overlay.cpp index fbf778a9..8165274c 100644 --- a/src/overlay.cpp +++ b/src/overlay.cpp @@ -582,9 +582,9 @@ static void render_benchmark(swapchain_stats& data, const struct overlay_params& ImGui::PushStyleColor(ImGuiCol_FrameBg, ImVec4(0.0, 0.0, 0.0, alpha / params.background_alpha)); ImGui::Dummy(ImVec2(0.0f, 8.0f)); if (params.enabled[OVERLAY_PARAM_ENABLED_histogram]) - ImGui::PlotHistogram("", benchmark.fps_data.data(), benchmark.fps_data.size(), 0, "", 0.0f, max + 10, ImVec2(ImGui::GetContentRegionAvailWidth(), 50)); + ImGui::PlotHistogram("", benchmark.fps_data.data(), benchmark.fps_data.size(), 0, "", 0.0f, max + 10, ImVec2(ImGui::GetContentRegionAvail().x, 50)); else - ImGui::PlotLines("", benchmark.fps_data.data(), benchmark.fps_data.size(), 0, "", 0.0f, max + 10, ImVec2(ImGui::GetContentRegionAvailWidth(), 50)); + ImGui::PlotLines("", benchmark.fps_data.data(), benchmark.fps_data.size(), 0, "", 0.0f, max + 10, ImVec2(ImGui::GetContentRegionAvail().x, 50)); ImGui::PopStyleColor(2); ImGui::End(); } @@ -683,7 +683,7 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2& if (HUDElements.table_columns_count > 0 && HUDElements.table_columns_count < 65 ) params.table_columns = HUDElements.table_columns_count; if(!params.enabled[OVERLAY_PARAM_ENABLED_horizontal_stretch]) { - float content_width = ImGui::GetContentRegionAvailWidth() - (params.table_columns * 64); + float content_width = ImGui::GetContentRegionAvail().x - (params.table_columns * 64); window_size = ImVec2(content_width, params.height); } } diff --git a/subprojects/imgui.wrap b/subprojects/imgui.wrap index bb10319b..ed0d8be2 100644 --- a/subprojects/imgui.wrap +++ b/subprojects/imgui.wrap @@ -1,11 +1,13 @@ [wrap-file] -directory = imgui-1.81 -source_url = https://github.com/ocornut/imgui/archive/v1.81.tar.gz -source_filename = imgui-1.81.tar.gz -source_hash = f7c619e03a06c0f25e8f47262dbc32d61fd033d2c91796812bf0f8c94fca78fb -patch_url = https://wrapdb.mesonbuild.com/v2/imgui_1.81-1/get_patch -patch_filename = imgui-1.81-1-wrap.zip -patch_hash = 6d00b442690b6a5c5d8f898311daafbce16d370cf64f53294c3b8c5c661e435f +directory = imgui-1.89.9 +source_url = https://github.com/ocornut/imgui/archive/refs/tags/v1.89.9.tar.gz +source_filename = imgui-1.89.9.tar.gz +source_hash = 1acc27a778b71d859878121a3f7b287cd81c29d720893d2b2bf74455bf9d52d6 +patch_filename = imgui_1.89.9-1_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/imgui_1.89.9-1/get_patch +patch_hash = 9b21290c597d76bf8d4eeb3f9ffa024b11d9ea6c61e91d648ccc90b42843d584 +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/imgui_1.89.9-1/imgui-1.89.9.tar.gz +wrapdb_version = 1.89.9-1 [provide] imgui = imgui_dep