From f5df923c510e6e08e8c6f5591f788ed340c5cb57 Mon Sep 17 00:00:00 2001 From: Bruno Date: Tue, 21 Feb 2023 10:10:22 +0100 Subject: [PATCH] BugFix: non-ImGui calls to accent color cause crash --- src/ImGuiToolkit.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/ImGuiToolkit.cpp b/src/ImGuiToolkit.cpp index 77318ee..4600334 100644 --- a/src/ImGuiToolkit.cpp +++ b/src/ImGuiToolkit.cpp @@ -1617,12 +1617,15 @@ void ImGuiToolkit::WindowDragFloat(const char* window_name, ImVec2 window_pos, f } } +ImVec4 __colorHighlight; +ImVec4 __colorHighlightActive; + ImVec4 ImGuiToolkit::HighlightColor(bool active) { if (active) - return ImGui::GetStyle().Colors[ImGuiCol_CheckMark]; + return __colorHighlightActive; else - return ImGui::GetStyle().Colors[ImGuiCol_TabUnfocusedActive]; + return __colorHighlight; } void ImGuiToolkit::SetAccentColor(accent_color color) @@ -1790,6 +1793,9 @@ void ImGuiToolkit::SetAccentColor(accent_color color) colors[ImGuiCol_DragDropTarget] = colors[ImGuiCol_HeaderActive]; } + __colorHighlight = colors[ImGuiCol_TabUnfocusedActive]; + __colorHighlightActive = colors[ImGuiCol_CheckMark]; + } void word_wrap(std::string *str, unsigned per_line)