rework creation of popout windows into factory and some refactoring in general

2023-10-27 02:51:26 +02:00
parent a8bc5386ea
commit 5c9415b6e9
15 changed files with 239 additions and 260 deletions
--- a/MareSynchronos/UI/Components/DrawUserPair.cs
+++ b/MareSynchronos/UI/Components/DrawUserPair.cs
@@ -408,7 +408,7 @@ public class DrawUserPair
        }
        if (ImGui.BeginPopup("User Flyout Menu"))
        {
-            UiSharedService.DrawWithID($"buttons-{_pair.UserData.UID}", () =>
+            using (ImRaii.PushId($"buttons-{_pair.UserData.UID}"))
            {
                ImGui.TextUnformatted("Common Pair Functions");
                DrawCommonClientMenu();
@@ -418,7 +418,7 @@ public class DrawUserPair
                {
                    _menuRenderWidth = ImGui.GetWindowContentRegionMax().X - ImGui.GetWindowContentRegionMin().X;
                }
-            });
+            }

            ImGui.EndPopup();
        }