diff --git a/MareSynchronos/MareSynchronos.csproj b/MareSynchronos/MareSynchronos.csproj index 27f4fc2..06a501c 100644 --- a/MareSynchronos/MareSynchronos.csproj +++ b/MareSynchronos/MareSynchronos.csproj @@ -1,5 +1,5 @@  - + diff --git a/MareSynchronos/Services/XivDataAnalyzer.cs b/MareSynchronos/Services/XivDataAnalyzer.cs index 67af652..5dcb7a4 100644 --- a/MareSynchronos/Services/XivDataAnalyzer.cs +++ b/MareSynchronos/Services/XivDataAnalyzer.cs @@ -43,8 +43,8 @@ public sealed class XivDataAnalyzer if ((nint)handle == nint.Zero) continue; var curBones = handle->BoneCount; // this is unrealistic, the filename shouldn't ever be that long - if (handle->ResourceHandle.FileName.Length > 1024) continue; - var skeletonName = handle->ResourceHandle.FileName.ToString(); + if (handle->FileName.Length > 1024) continue; + var skeletonName = handle->FileName.ToString(); if (string.IsNullOrEmpty(skeletonName)) continue; outputIndices[skeletonName] = new(); for (ushort boneIdx = 0; boneIdx < curBones; boneIdx++) diff --git a/MareSynchronos/UI/CharaDataHubUi.GposeTogether.cs b/MareSynchronos/UI/CharaDataHubUi.GposeTogether.cs index 6a2c1cd..e19f6ac 100644 --- a/MareSynchronos/UI/CharaDataHubUi.GposeTogether.cs +++ b/MareSynchronos/UI/CharaDataHubUi.GposeTogether.cs @@ -1,8 +1,8 @@ -using Dalamud.Interface; +using Dalamud.Bindings.ImGui; +using Dalamud.Interface; using Dalamud.Interface.Colors; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; -using ImGuiNET; using MareSynchronos.Services.CharaData.Models; namespace MareSynchronos.UI; diff --git a/MareSynchronos/UI/CharaDataHubUi.McdOnline.cs b/MareSynchronos/UI/CharaDataHubUi.McdOnline.cs index daa8143..2385938 100644 --- a/MareSynchronos/UI/CharaDataHubUi.McdOnline.cs +++ b/MareSynchronos/UI/CharaDataHubUi.McdOnline.cs @@ -1,8 +1,8 @@ -using Dalamud.Interface.Colors; +using Dalamud.Bindings.ImGui; +using Dalamud.Interface.Colors; using Dalamud.Interface.Utility.Raii; using Dalamud.Interface.Utility; using Dalamud.Interface; -using ImGuiNET; using MareSynchronos.API.Dto.CharaData; using MareSynchronos.Services.CharaData.Models; using System.Numerics; diff --git a/MareSynchronos/UI/CharaDataHubUi.NearbyPoses.cs b/MareSynchronos/UI/CharaDataHubUi.NearbyPoses.cs index ea9b64e..93d0d49 100644 --- a/MareSynchronos/UI/CharaDataHubUi.NearbyPoses.cs +++ b/MareSynchronos/UI/CharaDataHubUi.NearbyPoses.cs @@ -1,8 +1,8 @@ -using Dalamud.Interface.Colors; +using Dalamud.Bindings.ImGui; +using Dalamud.Interface.Colors; using Dalamud.Interface.Utility.Raii; using Dalamud.Interface.Utility; using Dalamud.Interface; -using ImGuiNET; using System.Numerics; namespace MareSynchronos.UI; diff --git a/MareSynchronos/UI/CharaDataHubUi.cs b/MareSynchronos/UI/CharaDataHubUi.cs index 90c7e20..05e2ab9 100644 --- a/MareSynchronos/UI/CharaDataHubUi.cs +++ b/MareSynchronos/UI/CharaDataHubUi.cs @@ -1,9 +1,9 @@ -using Dalamud.Interface; +using Dalamud.Bindings.ImGui; +using Dalamud.Interface; using Dalamud.Interface.Colors; using Dalamud.Interface.ImGuiFileDialog; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; -using ImGuiNET; using MareSynchronos.API.Dto.CharaData; using MareSynchronos.MareConfiguration; using MareSynchronos.MareConfiguration.Models; diff --git a/MareSynchronos/UI/CompactUI.cs b/MareSynchronos/UI/CompactUI.cs index 489e4b2..74ec5be 100644 --- a/MareSynchronos/UI/CompactUI.cs +++ b/MareSynchronos/UI/CompactUI.cs @@ -1,9 +1,9 @@ -using Dalamud.Interface; +using Dalamud.Bindings.ImGui; +using Dalamud.Interface; using Dalamud.Interface.Colors; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; using Dalamud.Utility; -using ImGuiNET; using MareSynchronos.API.Data.Extensions; using MareSynchronos.API.Dto.Group; using MareSynchronos.Interop.Ipc; diff --git a/MareSynchronos/UI/Components/DrawFolderBase.cs b/MareSynchronos/UI/Components/DrawFolderBase.cs index 39e56a7..be2d25b 100644 --- a/MareSynchronos/UI/Components/DrawFolderBase.cs +++ b/MareSynchronos/UI/Components/DrawFolderBase.cs @@ -1,6 +1,6 @@ -using Dalamud.Interface; +using Dalamud.Bindings.ImGui; +using Dalamud.Interface; using Dalamud.Interface.Utility.Raii; -using ImGuiNET; using MareSynchronos.PlayerData.Pairs; using MareSynchronos.UI.Handlers; using System.Collections.Immutable; diff --git a/MareSynchronos/UI/Components/DrawFolderGroup.cs b/MareSynchronos/UI/Components/DrawFolderGroup.cs index cf05c3f..8b92573 100644 --- a/MareSynchronos/UI/Components/DrawFolderGroup.cs +++ b/MareSynchronos/UI/Components/DrawFolderGroup.cs @@ -1,8 +1,8 @@ -using Dalamud.Interface; +using Dalamud.Bindings.ImGui; +using Dalamud.Interface; using Dalamud.Interface.Colors; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; -using ImGuiNET; using MareSynchronos.API.Data.Extensions; using MareSynchronos.API.Dto.Group; using MareSynchronos.PlayerData.Pairs; diff --git a/MareSynchronos/UI/Components/DrawFolderTag.cs b/MareSynchronos/UI/Components/DrawFolderTag.cs index 0dba36e..da61abb 100644 --- a/MareSynchronos/UI/Components/DrawFolderTag.cs +++ b/MareSynchronos/UI/Components/DrawFolderTag.cs @@ -1,6 +1,6 @@ -using Dalamud.Interface; +using Dalamud.Bindings.ImGui; +using Dalamud.Interface; using Dalamud.Interface.Utility.Raii; -using ImGuiNET; using MareSynchronos.API.Data.Extensions; using MareSynchronos.PlayerData.Pairs; using MareSynchronos.UI.Handlers; diff --git a/MareSynchronos/UI/Components/DrawGroupedGroupFolder.cs b/MareSynchronos/UI/Components/DrawGroupedGroupFolder.cs index d6a1b1e..1b71a47 100644 --- a/MareSynchronos/UI/Components/DrawGroupedGroupFolder.cs +++ b/MareSynchronos/UI/Components/DrawGroupedGroupFolder.cs @@ -1,6 +1,6 @@ -using Dalamud.Interface; +using Dalamud.Bindings.ImGui; +using Dalamud.Interface; using Dalamud.Interface.Utility.Raii; -using ImGuiNET; using MareSynchronos.UI.Handlers; using System.Collections.Immutable; using System.Numerics; diff --git a/MareSynchronos/UI/Components/DrawUserPair.cs b/MareSynchronos/UI/Components/DrawUserPair.cs index 944a6bc..ca9c3a9 100644 --- a/MareSynchronos/UI/Components/DrawUserPair.cs +++ b/MareSynchronos/UI/Components/DrawUserPair.cs @@ -1,8 +1,8 @@ -using Dalamud.Interface; +using Dalamud.Bindings.ImGui; +using Dalamud.Interface; using Dalamud.Interface.Colors; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; -using ImGuiNET; using MareSynchronos.API.Data.Extensions; using MareSynchronos.API.Dto.Group; using MareSynchronos.API.Dto.User; diff --git a/MareSynchronos/UI/Components/Popup/BanUserPopupHandler.cs b/MareSynchronos/UI/Components/Popup/BanUserPopupHandler.cs index 2cd5ffa..7b21c29 100644 --- a/MareSynchronos/UI/Components/Popup/BanUserPopupHandler.cs +++ b/MareSynchronos/UI/Components/Popup/BanUserPopupHandler.cs @@ -1,5 +1,5 @@ -using Dalamud.Interface; -using ImGuiNET; +using Dalamud.Bindings.ImGui; +using Dalamud.Interface; using MareSynchronos.API.Dto.Group; using MareSynchronos.PlayerData.Pairs; using MareSynchronos.Services.Mediator; diff --git a/MareSynchronos/UI/Components/Popup/CensusPopupHandler.cs b/MareSynchronos/UI/Components/Popup/CensusPopupHandler.cs index bb392a8..dba6bb4 100644 --- a/MareSynchronos/UI/Components/Popup/CensusPopupHandler.cs +++ b/MareSynchronos/UI/Components/Popup/CensusPopupHandler.cs @@ -1,5 +1,5 @@ -using Dalamud.Interface.Utility; -using ImGuiNET; +using Dalamud.Bindings.ImGui; +using Dalamud.Interface.Utility; using MareSynchronos.Services.ServerConfiguration; using System.Numerics; diff --git a/MareSynchronos/UI/Components/Popup/PopupHandler.cs b/MareSynchronos/UI/Components/Popup/PopupHandler.cs index 825bcec..778736f 100644 --- a/MareSynchronos/UI/Components/Popup/PopupHandler.cs +++ b/MareSynchronos/UI/Components/Popup/PopupHandler.cs @@ -1,7 +1,7 @@ -using Dalamud.Interface; +using Dalamud.Bindings.ImGui; +using Dalamud.Interface; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; -using ImGuiNET; using MareSynchronos.Services; using MareSynchronos.Services.Mediator; using Microsoft.Extensions.Logging; diff --git a/MareSynchronos/UI/Components/SelectPairForTagUi.cs b/MareSynchronos/UI/Components/SelectPairForTagUi.cs index f5ea9be..f64deb4 100644 --- a/MareSynchronos/UI/Components/SelectPairForTagUi.cs +++ b/MareSynchronos/UI/Components/SelectPairForTagUi.cs @@ -1,5 +1,5 @@ -using Dalamud.Interface.Utility; -using ImGuiNET; +using Dalamud.Bindings.ImGui; +using Dalamud.Interface.Utility; using MareSynchronos.PlayerData.Pairs; using MareSynchronos.UI.Handlers; diff --git a/MareSynchronos/UI/Components/SelectTagForPairUi.cs b/MareSynchronos/UI/Components/SelectTagForPairUi.cs index fbd01c2..3d52070 100644 --- a/MareSynchronos/UI/Components/SelectTagForPairUi.cs +++ b/MareSynchronos/UI/Components/SelectTagForPairUi.cs @@ -1,8 +1,8 @@ -using Dalamud.Interface; +using Dalamud.Bindings.ImGui; +using Dalamud.Interface; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; using Dalamud.Utility; -using ImGuiNET; using MareSynchronos.PlayerData.Pairs; using MareSynchronos.UI.Handlers; diff --git a/MareSynchronos/UI/CreateSyncshellUI.cs b/MareSynchronos/UI/CreateSyncshellUI.cs index c5b0f37..6d3e64e 100644 --- a/MareSynchronos/UI/CreateSyncshellUI.cs +++ b/MareSynchronos/UI/CreateSyncshellUI.cs @@ -1,6 +1,6 @@ -using Dalamud.Interface; +using Dalamud.Bindings.ImGui; +using Dalamud.Interface; using Dalamud.Interface.Utility; -using ImGuiNET; using MareSynchronos.API.Data.Extensions; using MareSynchronos.API.Dto.Group; using MareSynchronos.Services; diff --git a/MareSynchronos/UI/DataAnalysisUi.cs b/MareSynchronos/UI/DataAnalysisUi.cs index 73c202b..21a03c4 100644 --- a/MareSynchronos/UI/DataAnalysisUi.cs +++ b/MareSynchronos/UI/DataAnalysisUi.cs @@ -1,8 +1,8 @@ -using Dalamud.Interface; +using Dalamud.Bindings.ImGui; +using Dalamud.Interface; using Dalamud.Interface.Colors; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; -using ImGuiNET; using MareSynchronos.API.Data.Enum; using MareSynchronos.FileCache; using MareSynchronos.Interop.Ipc; diff --git a/MareSynchronos/UI/DownloadUi.cs b/MareSynchronos/UI/DownloadUi.cs index 3209630..d2c87a3 100644 --- a/MareSynchronos/UI/DownloadUi.cs +++ b/MareSynchronos/UI/DownloadUi.cs @@ -1,5 +1,5 @@ -using Dalamud.Interface.Colors; -using ImGuiNET; +using Dalamud.Bindings.ImGui; +using Dalamud.Interface.Colors; using MareSynchronos.MareConfiguration; using MareSynchronos.PlayerData.Handlers; using MareSynchronos.Services; diff --git a/MareSynchronos/UI/DtrEntry.cs b/MareSynchronos/UI/DtrEntry.cs index c68fd53..a22e38b 100644 --- a/MareSynchronos/UI/DtrEntry.cs +++ b/MareSynchronos/UI/DtrEntry.cs @@ -89,7 +89,7 @@ public sealed class DtrEntry : IDisposable, IHostedService { _logger.LogTrace("Creating new DtrBar entry"); var entry = _dtrBar.Get("Mare Synchronos"); - entry.OnClick = () => _mareMediator.Publish(new UiToggleMessage(typeof(CompactUi))); + entry.OnClick = _ => _mareMediator.Publish(new UiToggleMessage(typeof(CompactUi))); return entry; } diff --git a/MareSynchronos/UI/EditProfileUi.cs b/MareSynchronos/UI/EditProfileUi.cs index fc290d1..a2ffaf6 100644 --- a/MareSynchronos/UI/EditProfileUi.cs +++ b/MareSynchronos/UI/EditProfileUi.cs @@ -1,9 +1,9 @@ -using Dalamud.Interface; +using Dalamud.Bindings.ImGui; +using Dalamud.Interface; using Dalamud.Interface.Colors; using Dalamud.Interface.ImGuiFileDialog; using Dalamud.Interface.Textures.TextureWraps; using Dalamud.Interface.Utility; -using ImGuiNET; using MareSynchronos.API.Data; using MareSynchronos.API.Dto.User; using MareSynchronos.Services; @@ -86,14 +86,14 @@ public class EditProfileUi : WindowMediatorSubscriberBase if (_pfpTextureWrap != null) { - ImGui.Image(_pfpTextureWrap.ImGuiHandle, ImGuiHelpers.ScaledVector2(_pfpTextureWrap.Width, _pfpTextureWrap.Height)); + ImGui.Image(_pfpTextureWrap.Handle, ImGuiHelpers.ScaledVector2(_pfpTextureWrap.Width, _pfpTextureWrap.Height)); } var spacing = ImGui.GetStyle().ItemSpacing.X; ImGuiHelpers.ScaledRelativeSameLine(256, spacing); using (_uiSharedService.GameFont.Push()) { - var descriptionTextSize = ImGui.CalcTextSize(profile.Description, 256f); + var descriptionTextSize = ImGui.CalcTextSize(profile.Description, wrapWidth: 256f); var childFrame = ImGuiHelpers.ScaledVector2(256 + ImGui.GetStyle().WindowPadding.X + ImGui.GetStyle().WindowBorderSize, 256); if (descriptionTextSize.Y > childFrame.Y) { @@ -191,7 +191,7 @@ public class EditProfileUi : WindowMediatorSubscriberBase using (_uiSharedService.GameFont.Push()) { - var descriptionTextSizeLocal = ImGui.CalcTextSize(_descriptionText, 256f); + var descriptionTextSizeLocal = ImGui.CalcTextSize(_descriptionText, wrapWidth: 256f); var childFrameLocal = ImGuiHelpers.ScaledVector2(256 + ImGui.GetStyle().WindowPadding.X + ImGui.GetStyle().WindowBorderSize, 200); if (descriptionTextSizeLocal.Y > childFrameLocal.Y) { diff --git a/MareSynchronos/UI/EventViewerUI.cs b/MareSynchronos/UI/EventViewerUI.cs index fd4dba4..e1b8f14 100644 --- a/MareSynchronos/UI/EventViewerUI.cs +++ b/MareSynchronos/UI/EventViewerUI.cs @@ -1,7 +1,7 @@ -using Dalamud.Interface; +using Dalamud.Bindings.ImGui; +using Dalamud.Interface; using Dalamud.Interface.Colors; using Dalamud.Interface.Utility.Raii; -using ImGuiNET; using MareSynchronos.Services; using MareSynchronos.Services.Events; using MareSynchronos.Services.Mediator; diff --git a/MareSynchronos/UI/Handlers/IdDisplayHandler.cs b/MareSynchronos/UI/Handlers/IdDisplayHandler.cs index 07051c4..c013054 100644 --- a/MareSynchronos/UI/Handlers/IdDisplayHandler.cs +++ b/MareSynchronos/UI/Handlers/IdDisplayHandler.cs @@ -1,7 +1,6 @@ -using Dalamud.Interface; +using Dalamud.Bindings.ImGui; +using Dalamud.Interface; using Dalamud.Interface.Utility.Raii; -using ImGuiNET; -using ImGuiScene; using MareSynchronos.API.Dto.Group; using MareSynchronos.MareConfiguration; using MareSynchronos.PlayerData.Pairs; @@ -22,7 +21,6 @@ public class IdDisplayHandler private string _lastMouseOverUid = string.Empty; private bool _popupShown = false; private DateTime? _popupTime; - private TextureWrap? _textureWrap; public IdDisplayHandler(MareMediator mediator, ServerConfigurationManager serverManager, MareConfigService mareConfigService) { @@ -125,8 +123,6 @@ public class IdDisplayHandler _mediator.Publish(new ProfilePopoutToggle(Pair: null)); _lastMouseOverUid = string.Empty; _popupShown = false; - _textureWrap?.Dispose(); - _textureWrap = null; } } diff --git a/MareSynchronos/UI/IntroUI.cs b/MareSynchronos/UI/IntroUI.cs index 61e7122..b887313 100644 --- a/MareSynchronos/UI/IntroUI.cs +++ b/MareSynchronos/UI/IntroUI.cs @@ -1,8 +1,8 @@ -using Dalamud.Interface.Colors; +using Dalamud.Bindings.ImGui; +using Dalamud.Interface.Colors; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; using Dalamud.Utility; -using ImGuiNET; using MareSynchronos.FileCache; using MareSynchronos.Localization; using MareSynchronos.MareConfiguration; diff --git a/MareSynchronos/UI/JoinSyncshellUI.cs b/MareSynchronos/UI/JoinSyncshellUI.cs index 27c021e..507eb45 100644 --- a/MareSynchronos/UI/JoinSyncshellUI.cs +++ b/MareSynchronos/UI/JoinSyncshellUI.cs @@ -1,7 +1,7 @@ -using Dalamud.Interface.Colors; +using Dalamud.Bindings.ImGui; +using Dalamud.Interface.Colors; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; -using ImGuiNET; using MareSynchronos.API.Data.Enum; using MareSynchronos.API.Data.Extensions; using MareSynchronos.API.Dto; diff --git a/MareSynchronos/UI/PermissionWindowUI.cs b/MareSynchronos/UI/PermissionWindowUI.cs index 6e5dc2a..4c92721 100644 --- a/MareSynchronos/UI/PermissionWindowUI.cs +++ b/MareSynchronos/UI/PermissionWindowUI.cs @@ -1,6 +1,6 @@ -using Dalamud.Interface.Utility; +using Dalamud.Bindings.ImGui; +using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; -using ImGuiNET; using MareSynchronos.API.Data.Enum; using MareSynchronos.API.Data.Extensions; using MareSynchronos.PlayerData.Pairs; diff --git a/MareSynchronos/UI/PopoutProfileUi.cs b/MareSynchronos/UI/PopoutProfileUi.cs index 71c2dea..049ce4a 100644 --- a/MareSynchronos/UI/PopoutProfileUi.cs +++ b/MareSynchronos/UI/PopoutProfileUi.cs @@ -1,7 +1,7 @@ -using Dalamud.Interface.Colors; +using Dalamud.Bindings.ImGui; +using Dalamud.Interface.Colors; using Dalamud.Interface.Textures.TextureWraps; using Dalamud.Interface.Utility; -using ImGuiNET; using MareSynchronos.API.Data.Extensions; using MareSynchronos.MareConfiguration; using MareSynchronos.PlayerData.Pairs; @@ -159,12 +159,12 @@ public class PopoutProfileUi : WindowMediatorSubscriberBase var font = _uiSharedService.GameFont.Push(); var remaining = ImGui.GetWindowContentRegionMax().Y - ImGui.GetCursorPosY(); var descText = mareProfile.Description; - var textSize = ImGui.CalcTextSize(descText, 256f * ImGuiHelpers.GlobalScale); + var textSize = ImGui.CalcTextSize(descText, wrapWidth: 256f * ImGuiHelpers.GlobalScale); bool trimmed = textSize.Y > remaining; while (textSize.Y > remaining && descText.Contains(' ')) { descText = descText[..descText.LastIndexOf(' ')].TrimEnd(); - textSize = ImGui.CalcTextSize(descText + $"...{Environment.NewLine}[Open Full Profile for complete description]", 256f * ImGuiHelpers.GlobalScale); + textSize = ImGui.CalcTextSize(descText + $"...{Environment.NewLine}[Open Full Profile for complete description]", wrapWidth: 256f * ImGuiHelpers.GlobalScale); } UiSharedService.TextWrapped(trimmed ? descText + $"...{Environment.NewLine}[Open Full Profile for complete description]" : mareProfile.Description); font.Dispose(); @@ -176,12 +176,12 @@ public class PopoutProfileUi : WindowMediatorSubscriberBase var newHeight = _textureWrap.Height * stretchFactor; var remainingWidth = (256f * ImGuiHelpers.GlobalScale - newWidth) / 2f; var remainingHeight = (256f * ImGuiHelpers.GlobalScale - newHeight) / 2f; - drawList.AddImage(_textureWrap.ImGuiHandle, new Vector2(rectMin.X + padding + remainingWidth, rectMin.Y + spacing.Y + imagePos.Y + remainingHeight), + drawList.AddImage(_textureWrap.Handle, new Vector2(rectMin.X + padding + remainingWidth, rectMin.Y + spacing.Y + imagePos.Y + remainingHeight), new Vector2(rectMin.X + padding + remainingWidth + newWidth, rectMin.Y + spacing.Y + imagePos.Y + remainingHeight + newHeight)); if (_supporterTextureWrap != null) { const float iconSize = 38; - drawList.AddImage(_supporterTextureWrap.ImGuiHandle, + drawList.AddImage(_supporterTextureWrap.Handle, new Vector2(rectMax.X - iconSize - spacing.X, rectMin.Y + (textPos / 2) - (iconSize / 2)), new Vector2(rectMax.X - spacing.X, rectMin.Y + iconSize + (textPos / 2) - (iconSize / 2))); } diff --git a/MareSynchronos/UI/SettingsUi.cs b/MareSynchronos/UI/SettingsUi.cs index dd69076..31f2075 100644 --- a/MareSynchronos/UI/SettingsUi.cs +++ b/MareSynchronos/UI/SettingsUi.cs @@ -1,9 +1,9 @@ -using Dalamud.Interface; +using Dalamud.Bindings.ImGui; +using Dalamud.Interface; using Dalamud.Interface.Colors; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; using Dalamud.Utility; -using ImGuiNET; using MareSynchronos.API.Data; using MareSynchronos.API.Data.Comparer; using MareSynchronos.API.Routes; diff --git a/MareSynchronos/UI/StandaloneProfileUi.cs b/MareSynchronos/UI/StandaloneProfileUi.cs index 4545b1e..8966d71 100644 --- a/MareSynchronos/UI/StandaloneProfileUi.cs +++ b/MareSynchronos/UI/StandaloneProfileUi.cs @@ -1,7 +1,7 @@ -using Dalamud.Interface.Colors; +using Dalamud.Bindings.ImGui; +using Dalamud.Interface.Colors; using Dalamud.Interface.Textures.TextureWraps; using Dalamud.Interface.Utility; -using ImGuiNET; using MareSynchronos.API.Data.Extensions; using MareSynchronos.PlayerData.Pairs; using MareSynchronos.Services; @@ -86,7 +86,7 @@ public class StandaloneProfileUi : WindowMediatorSubscriberBase ImGuiHelpers.ScaledDummy(new Vector2(256, 256 + spacing.Y)); var postDummy = ImGui.GetCursorPosY(); ImGui.SameLine(); - var descriptionTextSize = ImGui.CalcTextSize(mareProfile.Description, 256f); + var descriptionTextSize = ImGui.CalcTextSize(mareProfile.Description, wrapWidth: 256f); var descriptionChildHeight = rectMax.Y - pos.Y - rectMin.Y - spacing.Y * 2; if (descriptionTextSize.Y > descriptionChildHeight && !_adjustedForScrollBars) { @@ -158,12 +158,12 @@ public class StandaloneProfileUi : WindowMediatorSubscriberBase var newHeight = _textureWrap.Height * stretchFactor; var remainingWidth = (256f * ImGuiHelpers.GlobalScale - newWidth) / 2f; var remainingHeight = (256f * ImGuiHelpers.GlobalScale - newHeight) / 2f; - drawList.AddImage(_textureWrap.ImGuiHandle, new Vector2(rectMin.X + padding + remainingWidth, rectMin.Y + spacing.Y + pos.Y + remainingHeight), + drawList.AddImage(_textureWrap.Handle, new Vector2(rectMin.X + padding + remainingWidth, rectMin.Y + spacing.Y + pos.Y + remainingHeight), new Vector2(rectMin.X + padding + remainingWidth + newWidth, rectMin.Y + spacing.Y + pos.Y + remainingHeight + newHeight)); if (_supporterTextureWrap != null) { const float iconSize = 38; - drawList.AddImage(_supporterTextureWrap.ImGuiHandle, + drawList.AddImage(_supporterTextureWrap.Handle, new Vector2(rectMax.X - iconSize - spacing.X, rectMin.Y + (textPos / 2) - (iconSize / 2)), new Vector2(rectMax.X - spacing.X, rectMin.Y + iconSize + (textPos / 2) - (iconSize / 2))); } diff --git a/MareSynchronos/UI/SyncshellAdminUI.cs b/MareSynchronos/UI/SyncshellAdminUI.cs index 529797e..95ae1f9 100644 --- a/MareSynchronos/UI/SyncshellAdminUI.cs +++ b/MareSynchronos/UI/SyncshellAdminUI.cs @@ -1,8 +1,8 @@ -using Dalamud.Interface; +using Dalamud.Bindings.ImGui; +using Dalamud.Interface; using Dalamud.Interface.Colors; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; -using ImGuiNET; using MareSynchronos.API.Data.Enum; using MareSynchronos.API.Data.Extensions; using MareSynchronos.API.Dto.Group; diff --git a/MareSynchronos/UI/TopTabMenu.cs b/MareSynchronos/UI/TopTabMenu.cs index 7016a76..ac695fc 100644 --- a/MareSynchronos/UI/TopTabMenu.cs +++ b/MareSynchronos/UI/TopTabMenu.cs @@ -1,8 +1,8 @@ -using Dalamud.Interface; +using Dalamud.Bindings.ImGui; +using Dalamud.Interface; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; using Dalamud.Utility; -using ImGuiNET; using MareSynchronos.API.Data.Enum; using MareSynchronos.API.Data.Extensions; using MareSynchronos.PlayerData.Pairs; diff --git a/MareSynchronos/UI/UISharedService.cs b/MareSynchronos/UI/UISharedService.cs index 3bd1f52..a16e807 100644 --- a/MareSynchronos/UI/UISharedService.cs +++ b/MareSynchronos/UI/UISharedService.cs @@ -1,4 +1,5 @@ -using Dalamud.Interface; +using Dalamud.Bindings.ImGui; +using Dalamud.Interface; using Dalamud.Interface.Colors; using Dalamud.Interface.GameFonts; using Dalamud.Interface.ImGuiFileDialog; @@ -9,7 +10,6 @@ using Dalamud.Interface.Utility.Raii; using Dalamud.Plugin; using Dalamud.Plugin.Services; using Dalamud.Utility; -using ImGuiNET; using MareSynchronos.FileCache; using MareSynchronos.Interop.Ipc; using MareSynchronos.Localization; @@ -231,7 +231,7 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase public static void DrawGroupedCenteredColorText(string text, Vector4 color, float? maxWidth = null) { var availWidth = ImGui.GetContentRegionAvail().X; - var textWidth = ImGui.CalcTextSize(text, availWidth).X; + var textWidth = ImGui.CalcTextSize(text, wrapWidth: availWidth).X; if (maxWidth != null && textWidth > maxWidth * ImGuiHelpers.GlobalScale) textWidth = maxWidth.Value * ImGuiHelpers.GlobalScale; ImGui.SetCursorPosX(ImGui.GetCursorPosX() + (availWidth / 2f) - (textWidth / 2f)); DrawGrouped(() => diff --git a/MareSynchronos/packages.lock.json b/MareSynchronos/packages.lock.json index 91d21a0..71ffea5 100644 --- a/MareSynchronos/packages.lock.json +++ b/MareSynchronos/packages.lock.json @@ -4,9 +4,9 @@ "net9.0-windows7.0": { "DalamudPackager": { "type": "Direct", - "requested": "[12.0.0, )", - "resolved": "12.0.0", - "contentHash": "J5TJLV3f16T/E2H2P17ClWjtfEBPpq3yxvqW46eN36JCm6wR+EaoaYkqG9Rm5sHqs3/nK/vKjWWyvEs/jhKoXw==" + "requested": "[13.0.0, )", + "resolved": "13.0.0", + "contentHash": "Mb3cUDSK/vDPQ8gQIeuCw03EMYrej1B4J44a1AvIJ9C759p9XeqdU9Hg4WgOmlnlPe0G7ILTD32PKSUpkQNa8w==" }, "DotNet.ReproducibleBuilds": { "type": "Direct",