t0w0bi/ClubPenguinClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
rootdarkarchon
2023-10-27 02:51:26 +02:00
parent a8bc5386ea
commit 5c9415b6e9
15 changed files with 239 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
MareSynchronos/UI/Components/DrawFolderBase.cs
View File

@@ -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();
}

4
MareSynchronos/UI/Components/DrawUserPair.cs
View File

@@ -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();
}

3
MareSynchronos/UI/Components/SelectTagForPairUi.cs
View File

@@ -1,6 +1,7 @@
using Dalamud.Interface;
using Dalamud.Interface.Components;
using Dalamud.Interface.Utility;
using Dalamud.Interface.Utility.Raii;
using Dalamud.Utility;
using ImGuiNET;
using MareSynchronos.PlayerData.Pairs;
@@ -66,7 +67,7 @@ public class SelectTagForPairUi
{
foreach (var tag in tags)
{
UiSharedService.DrawWithID($"groups-pair-{_pair.UserData.UID}-{tag}", () => DrawGroupName(_pair, tag));
using (ImRaii.PushId($"groups-pair-{_pair.UserData.UID}-{tag}")) DrawGroupName(_pair, tag);
}
ImGui.EndChild();
}