eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-19 14:19:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

BugFix: non-ImGui calls to accent color cause crash

Browse Source
This commit is contained in:
Bruno
2023-02-21 10:10:22 +01:00
parent f1f62816b5
commit f5df923c51
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ImGuiToolkit.cpp
View File

@@ -1617,12 +1617,15 @@ void ImGuiToolkit::WindowDragFloat(const char* window_name, ImVec2 window_pos, f
} }
} }
ImVec4 __colorHighlight;
ImVec4 __colorHighlightActive;
ImVec4 ImGuiToolkit::HighlightColor(bool active) ImVec4 ImGuiToolkit::HighlightColor(bool active)
{ {
if (active) if (active)
return ImGui::GetStyle().Colors[ImGuiCol_CheckMark]; return __colorHighlightActive;
else else
return ImGui::GetStyle().Colors[ImGuiCol_TabUnfocusedActive]; return __colorHighlight;
} }
void ImGuiToolkit::SetAccentColor(accent_color color) void ImGuiToolkit::SetAccentColor(accent_color color)
@@ -1790,6 +1793,9 @@ void ImGuiToolkit::SetAccentColor(accent_color color)
colors[ImGuiCol_DragDropTarget] = colors[ImGuiCol_HeaderActive]; colors[ImGuiCol_DragDropTarget] = colors[ImGuiCol_HeaderActive];
} }
__colorHighlight = colors[ImGuiCol_TabUnfocusedActive];
__colorHighlightActive = colors[ImGuiCol_CheckMark];
} }
void word_wrap(std::string *str, unsigned per_line) void word_wrap(std::string *str, unsigned per_line)