Merge pull request #1 from katemonster33/refactor-draw_colored_text-2

Colors pushed to ImGui color stack get popped back off
CleverRaven · May 19, 2024 · 4767a3d · 4767a3d
2 parents 24616b2 + 5e1467a
commit 4767a3d
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/cata_imgui.cpp b/src/cata_imgui.cpp
@@ -430,6 +430,7 @@ void cataimgui::window::draw_colored_text( std::string const &text,
         float wrap_width, bool *is_selected, bool *is_focused, bool *is_hovered )
 {
     ImGui::PushID( text.c_str() );
+    int startColorStackCount = GImGui->ColorStack.Size;
     ImGuiID itemId = GImGui->CurrentWindow->IDStack.back();
     size_t chars_per_line = size_t( wrap_width );
     if( chars_per_line == 0 ) {
@@ -472,7 +473,10 @@ void cataimgui::window::draw_colored_text( std::string const &text,
 
         }
     }
-
+    for( int curColorStackCount = GImGui->ColorStack.Size; curColorStackCount > startColorStackCount;
+         curColorStackCount-- ) {
+        ImGui::PopStyleColor();
+    }
     ImGui::PopID();
 }