From d412f097a9f59e7f4ce12471bb0efe609b65c831 Mon Sep 17 00:00:00 2001 From: tupoy-ya Date: Mon, 30 Dec 2024 18:08:40 +0500 Subject: [PATCH] fix: Update imgui. --- game/client/imgui/imgui_impl_source.cpp | 5 +++-- game/client/imgui/imgui_system.cpp | 8 ++++---- thirdparty | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/game/client/imgui/imgui_impl_source.cpp b/game/client/imgui/imgui_impl_source.cpp index 261ebf94..f657f8f0 100644 --- a/game/client/imgui/imgui_impl_source.cpp +++ b/game/client/imgui/imgui_impl_source.cpp @@ -163,14 +163,15 @@ bool ImGui_ImplSource_Init() { // Setup backend capabilities flags ImGuiIO &io = ImGui::GetIO(); + ImGuiPlatformIO &platform_io = ImGui::GetPlatformIO(); io.BackendPlatformName = "source"; io.BackendRendererName = "imgui_impl_source"; io.BackendFlags = ImGuiBackendFlags_None; - io.SetClipboardTextFn = []( void *, const char *c ) + platform_io.Platform_SetClipboardTextFn = []( void *, const char *c ) { vgui::system()->SetClipboardText( c, V_strlen( c ) ); }; - io.GetClipboardTextFn = []( void *ctx ) -> const char * + platform_io.Platform_GetClipboardTextFn = []( void *ctx ) -> const char * { auto &g = *static_cast( ctx ); g.ClipboardHandlerData.clear(); diff --git a/game/client/imgui/imgui_system.cpp b/game/client/imgui/imgui_system.cpp index 20b1ec9c..262c1407 100644 --- a/game/client/imgui/imgui_system.cpp +++ b/game/client/imgui/imgui_system.cpp @@ -478,16 +478,16 @@ void CDearImGuiSystem::SetStyle() style.Colors[ImGuiCol_ResizeGripActive] = ImVec4(0.26f, 0.59f, 0.98f, 0.95f); style.Colors[ImGuiCol_Tab] = ImVec4(0.08f, 0.08f, 0.09f, 0.83f); style.Colors[ImGuiCol_TabHovered] = ImVec4(0.33f, 0.34f, 0.36f, 0.83f); - style.Colors[ImGuiCol_TabActive] = ImVec4(0.23f, 0.23f, 0.24f, 1.00f); - style.Colors[ImGuiCol_TabUnfocused] = ImVec4(0.08f, 0.08f, 0.09f, 1.00f); - style.Colors[ImGuiCol_TabUnfocusedActive] = ImVec4(0.13f, 0.14f, 0.15f, 1.00f); + style.Colors[ImGuiCol_TabSelected] = ImVec4(0.23f, 0.23f, 0.24f, 1.00f); + style.Colors[ImGuiCol_TabDimmed] = ImVec4(0.08f, 0.08f, 0.09f, 1.00f); + style.Colors[ImGuiCol_TabDimmedSelected] = ImVec4(0.13f, 0.14f, 0.15f, 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.90f, 0.70f, 0.00f, 1.00f); style.Colors[ImGuiCol_PlotHistogramHovered] = ImVec4(1.00f, 0.60f, 0.00f, 1.00f); style.Colors[ImGuiCol_TextSelectedBg] = ImVec4(0.26f, 0.59f, 0.98f, 0.35f); style.Colors[ImGuiCol_DragDropTarget] = ImVec4(0.11f, 0.64f, 0.92f, 1.00f); - style.Colors[ImGuiCol_NavHighlight] = ImVec4(0.26f, 0.59f, 0.98f, 1.00f); + style.Colors[ImGuiCol_NavCursor] = ImVec4(0.26f, 0.59f, 0.98f, 1.00f); style.Colors[ImGuiCol_NavWindowingHighlight] = ImVec4(1.00f, 1.00f, 1.00f, 0.70f); style.Colors[ImGuiCol_NavWindowingDimBg] = ImVec4(0.80f, 0.80f, 0.80f, 0.20f); style.Colors[ImGuiCol_ModalWindowDimBg] = ImVec4(0.80f, 0.80f, 0.80f, 0.35f); diff --git a/thirdparty b/thirdparty index f2e3a856..cafff0e4 160000 --- a/thirdparty +++ b/thirdparty @@ -1 +1 @@ -Subproject commit f2e3a856cc64582e22bdfaa4a67656c9794a618d +Subproject commit cafff0e47374dbfc190c2b0e6a422a91b8864fa3