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/DrawFolderBase.cs
+++ b/MareSynchronos/UI/Components/DrawFolderBase.cs
@@ -99,10 +99,7 @@ public abstract class DrawFolderBase : IDrawFolder
            }
            if (ImGui.BeginPopup("User Flyout Menu"))
            {
-                UiSharedService.DrawWithID($"buttons-{_id}", () =>
-                {
-                    DrawMenu(_menuWidth);
-                });
+                using (ImRaii.PushId($"buttons-{_id}")) DrawMenu(_menuWidth);
                _menuWidth = ImGui.GetWindowContentRegionMax().X - ImGui.GetWindowContentRegionMin().X;
                ImGui.EndPopup();
            }