diff --git a/Glamourer.Api b/Glamourer.Api index 5e5c867..2fb517e 160000 --- a/Glamourer.Api +++ b/Glamourer.Api @@ -1 +1 @@ -Subproject commit 5e5c867a095eecac0dd494b30a33298a65e46426 +Subproject commit 2fb517e2bbd27268aeca0c5546d4979ad5ac4be2 diff --git a/MareSynchronos/MareSynchronos.csproj b/MareSynchronos/MareSynchronos.csproj index 5b790ea..f37f45c 100644 --- a/MareSynchronos/MareSynchronos.csproj +++ b/MareSynchronos/MareSynchronos.csproj @@ -1,5 +1,5 @@  - + LoporritSync 9.9.0 diff --git a/MareSynchronos/Services/PluginWatcherService.cs b/MareSynchronos/Services/PluginWatcherService.cs index a3528c5..b5d221f 100644 --- a/MareSynchronos/Services/PluginWatcherService.cs +++ b/MareSynchronos/Services/PluginWatcherService.cs @@ -88,9 +88,11 @@ public class PluginWatcherService : MediatorSubscriberBase Logger.LogError(e, "PluginWatcherService exception"); } }); + + Update(publish: false); } - private void Update() + private void Update(bool publish = true) { if (!ExposedPluginsEqual(_pluginInterface.InstalledPlugins, _prevInstalledPluginState)) { @@ -111,20 +113,20 @@ public class PluginWatcherService : MediatorSubscriberBase foreach (var internalName in newDict.Keys.Except(oldDict.Keys, StringComparer.Ordinal)) { var p = newDict[internalName].OrderBy(p => (!p.IsLoaded, p.Version)).First(); - Mediator.Publish(new PluginChangeMessage(internalName, p.Version, p.IsLoaded)); + if (publish) Mediator.Publish(new PluginChangeMessage(internalName, p.Version, p.IsLoaded)); } foreach (var internalName in oldDict.Keys.Except(newDict.Keys, StringComparer.Ordinal)) { var p = newDict[internalName].OrderBy(p => (!p.IsLoaded, p.Version)).First(); - Mediator.Publish(new PluginChangeMessage(p.InternalName, p.Version, p.IsLoaded)); + if (publish) Mediator.Publish(new PluginChangeMessage(p.InternalName, p.Version, p.IsLoaded)); } foreach (var changedGroup in newDict.Where(p => oldDict.TryGetValue(p.Key, out var old) && !old.SequenceEqual(p.Value))) { var internalName = changedGroup.Value.First().InternalName; var p = newDict[internalName].OrderBy(p => (!p.IsLoaded, p.Version)).First(); - Mediator.Publish(new PluginChangeMessage(p.InternalName, p.Version, p.IsLoaded)); + if (publish) Mediator.Publish(new PluginChangeMessage(p.InternalName, p.Version, p.IsLoaded)); } } } diff --git a/MareSynchronos/Services/XivDataAnalyzer.cs b/MareSynchronos/Services/XivDataAnalyzer.cs index ca193e6..d6731a2 100644 --- a/MareSynchronos/Services/XivDataAnalyzer.cs +++ b/MareSynchronos/Services/XivDataAnalyzer.cs @@ -46,8 +46,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 b1db44f..e7524dc 100644 --- a/MareSynchronos/UI/CharaDataHubUi.GposeTogether.cs +++ b/MareSynchronos/UI/CharaDataHubUi.GposeTogether.cs @@ -2,7 +2,7 @@ using Dalamud.Interface.Colors; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; -using ImGuiNET; +using Dalamud.Bindings.ImGui; using MareSynchronos.Services.CharaData.Models; namespace MareSynchronos.UI; diff --git a/MareSynchronos/UI/CharaDataHubUi.McdOnline.cs b/MareSynchronos/UI/CharaDataHubUi.McdOnline.cs index 220a8ad..e77b2b9 100644 --- a/MareSynchronos/UI/CharaDataHubUi.McdOnline.cs +++ b/MareSynchronos/UI/CharaDataHubUi.McdOnline.cs @@ -2,7 +2,7 @@ using Dalamud.Interface.Utility.Raii; using Dalamud.Interface.Utility; using Dalamud.Interface; -using ImGuiNET; +using Dalamud.Bindings.ImGui; 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 df1d3f8..d674ae4 100644 --- a/MareSynchronos/UI/CharaDataHubUi.NearbyPoses.cs +++ b/MareSynchronos/UI/CharaDataHubUi.NearbyPoses.cs @@ -2,7 +2,7 @@ using Dalamud.Interface.Utility.Raii; using Dalamud.Interface.Utility; using Dalamud.Interface; -using ImGuiNET; +using Dalamud.Bindings.ImGui; using System.Numerics; namespace MareSynchronos.UI; diff --git a/MareSynchronos/UI/CharaDataHubUi.cs b/MareSynchronos/UI/CharaDataHubUi.cs index 0700aed..d3d33ab 100644 --- a/MareSynchronos/UI/CharaDataHubUi.cs +++ b/MareSynchronos/UI/CharaDataHubUi.cs @@ -3,7 +3,7 @@ using Dalamud.Interface.Colors; using Dalamud.Interface.ImGuiFileDialog; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; -using ImGuiNET; +using Dalamud.Bindings.ImGui; 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 4952399..796f5f2 100644 --- a/MareSynchronos/UI/CompactUI.cs +++ b/MareSynchronos/UI/CompactUI.cs @@ -9,7 +9,7 @@ using Dalamud.Interface.Components; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; using Dalamud.Utility; -using ImGuiNET; +using Dalamud.Bindings.ImGui; using MareSynchronos.API.Data.Extensions; using MareSynchronos.API.Dto.User; using MareSynchronos.MareConfiguration; diff --git a/MareSynchronos/UI/Components/DrawGroupPair.cs b/MareSynchronos/UI/Components/DrawGroupPair.cs index a0d8e1f..e090bbb 100644 --- a/MareSynchronos/UI/Components/DrawGroupPair.cs +++ b/MareSynchronos/UI/Components/DrawGroupPair.cs @@ -1,7 +1,7 @@ using Dalamud.Interface.Colors; using Dalamud.Interface.Components; using Dalamud.Interface; -using ImGuiNET; +using Dalamud.Bindings.ImGui; using MareSynchronos.PlayerData.Pairs; using MareSynchronos.API.Data.Extensions; using MareSynchronos.WebAPI; diff --git a/MareSynchronos/UI/Components/DrawPairBase.cs b/MareSynchronos/UI/Components/DrawPairBase.cs index aef7321..bbac435 100644 --- a/MareSynchronos/UI/Components/DrawPairBase.cs +++ b/MareSynchronos/UI/Components/DrawPairBase.cs @@ -1,5 +1,5 @@ using Dalamud.Interface; -using ImGuiNET; +using Dalamud.Bindings.ImGui; using MareSynchronos.PlayerData.Pairs; using MareSynchronos.UI.Handlers; using MareSynchronos.WebAPI; diff --git a/MareSynchronos/UI/Components/DrawUserPair.cs b/MareSynchronos/UI/Components/DrawUserPair.cs index eee5b60..33facc2 100644 --- a/MareSynchronos/UI/Components/DrawUserPair.cs +++ b/MareSynchronos/UI/Components/DrawUserPair.cs @@ -2,7 +2,7 @@ using Dalamud.Interface.Components; using Dalamud.Interface.Utility.Raii; using Dalamud.Interface; -using ImGuiNET; +using Dalamud.Bindings.ImGui; using MareSynchronos.PlayerData.Pairs; using System.Numerics; using MareSynchronos.API.Data.Extensions; diff --git a/MareSynchronos/UI/Components/GroupPanel.cs b/MareSynchronos/UI/Components/GroupPanel.cs index 168c69f..712f5c7 100644 --- a/MareSynchronos/UI/Components/GroupPanel.cs +++ b/MareSynchronos/UI/Components/GroupPanel.cs @@ -2,7 +2,7 @@ using Dalamud.Interface.Utility.Raii; using Dalamud.Interface; using Dalamud.Utility; -using ImGuiNET; +using Dalamud.Bindings.ImGui; using MareSynchronos.WebAPI; using System.Numerics; using System.Globalization; diff --git a/MareSynchronos/UI/Components/PairGroupsUi.cs b/MareSynchronos/UI/Components/PairGroupsUi.cs index 529371b..8e94935 100644 --- a/MareSynchronos/UI/Components/PairGroupsUi.cs +++ b/MareSynchronos/UI/Components/PairGroupsUi.cs @@ -2,7 +2,7 @@ using Dalamud.Interface.Components; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; -using ImGuiNET; +using Dalamud.Bindings.ImGui; using MareSynchronos.API.Data.Extensions; using MareSynchronos.MareConfiguration; using MareSynchronos.UI.Handlers; diff --git a/MareSynchronos/UI/Components/Popup/BanUserPopupHandler.cs b/MareSynchronos/UI/Components/Popup/BanUserPopupHandler.cs index 2cd5ffa..3eb5b8c 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 MareSynchronos.API.Dto.Group; using MareSynchronos.PlayerData.Pairs; using MareSynchronos.Services.Mediator; diff --git a/MareSynchronos/UI/Components/Popup/PopupHandler.cs b/MareSynchronos/UI/Components/Popup/PopupHandler.cs index 6f332c4..ebfc5c4 100644 --- a/MareSynchronos/UI/Components/Popup/PopupHandler.cs +++ b/MareSynchronos/UI/Components/Popup/PopupHandler.cs @@ -1,7 +1,7 @@ using Dalamud.Interface; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; -using ImGuiNET; +using Dalamud.Bindings.ImGui; using MareSynchronos.Services; using MareSynchronos.Services.Mediator; using Microsoft.Extensions.Logging; diff --git a/MareSynchronos/UI/Components/Popup/ReportPopupHandler.cs b/MareSynchronos/UI/Components/Popup/ReportPopupHandler.cs index 93227f8..b9ab62f 100644 --- a/MareSynchronos/UI/Components/Popup/ReportPopupHandler.cs +++ b/MareSynchronos/UI/Components/Popup/ReportPopupHandler.cs @@ -1,7 +1,7 @@ using Dalamud.Interface; using Dalamud.Interface.Colors; using Dalamud.Interface.Utility.Raii; -using ImGuiNET; +using Dalamud.Bindings.ImGui; using MareSynchronos.PlayerData.Pairs; using MareSynchronos.Services.Mediator; using MareSynchronos.WebAPI; diff --git a/MareSynchronos/UI/Components/SelectGroupForPairUi.cs b/MareSynchronos/UI/Components/SelectGroupForPairUi.cs index 7942afe..ee6888e 100644 --- a/MareSynchronos/UI/Components/SelectGroupForPairUi.cs +++ b/MareSynchronos/UI/Components/SelectGroupForPairUi.cs @@ -3,7 +3,7 @@ using Dalamud.Interface; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; using Dalamud.Utility; -using ImGuiNET; +using Dalamud.Bindings.ImGui; using MareSynchronos.PlayerData.Pairs; using MareSynchronos.UI.Handlers; diff --git a/MareSynchronos/UI/Components/SelectPairForGroupUi.cs b/MareSynchronos/UI/Components/SelectPairForGroupUi.cs index 829802f..c29c5fb 100644 --- a/MareSynchronos/UI/Components/SelectPairForGroupUi.cs +++ b/MareSynchronos/UI/Components/SelectPairForGroupUi.cs @@ -1,5 +1,5 @@ using Dalamud.Interface.Utility; -using ImGuiNET; +using Dalamud.Bindings.ImGui; using MareSynchronos.PlayerData.Pairs; using MareSynchronos.UI.Handlers; using System.Numerics; diff --git a/MareSynchronos/UI/DataAnalysisUi.cs b/MareSynchronos/UI/DataAnalysisUi.cs index d083cea..77bd403 100644 --- a/MareSynchronos/UI/DataAnalysisUi.cs +++ b/MareSynchronos/UI/DataAnalysisUi.cs @@ -1,7 +1,7 @@ using Dalamud.Interface; using Dalamud.Interface.Colors; using Dalamud.Interface.Utility.Raii; -using ImGuiNET; +using Dalamud.Bindings.ImGui; using MareSynchronos.API.Data.Enum; using MareSynchronos.Interop.Ipc; using MareSynchronos.Services; diff --git a/MareSynchronos/UI/DownloadUi.cs b/MareSynchronos/UI/DownloadUi.cs index 7f896c9..1edd907 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 MareSynchronos.MareConfiguration; using MareSynchronos.PlayerData.Handlers; using MareSynchronos.Services; diff --git a/MareSynchronos/UI/DtrEntry.cs b/MareSynchronos/UI/DtrEntry.cs index 9fd02b1..96fbc71 100644 --- a/MareSynchronos/UI/DtrEntry.cs +++ b/MareSynchronos/UI/DtrEntry.cs @@ -105,7 +105,7 @@ public sealed class DtrEntry : IDisposable, IHostedService { _logger.LogTrace("Creating new DtrBar entry"); var entry = _dtrBar.Get("Loporrit"); - 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 100514e..e3d25fe 100644 --- a/MareSynchronos/UI/EditProfileUi.cs +++ b/MareSynchronos/UI/EditProfileUi.cs @@ -3,7 +3,7 @@ using Dalamud.Interface.Colors; using Dalamud.Interface.ImGuiFileDialog; using Dalamud.Interface.Textures.TextureWraps; using Dalamud.Interface.Utility; -using ImGuiNET; +using Dalamud.Bindings.ImGui; using MareSynchronos.API.Data; using MareSynchronos.API.Dto.User; using MareSynchronos.Services; @@ -89,14 +89,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, hideTextAfterDoubleHash: false, 256f); var childFrame = ImGuiHelpers.ScaledVector2(256 + ImGui.GetStyle().WindowPadding.X + ImGui.GetStyle().WindowBorderSize, 256); if (descriptionTextSize.Y > childFrame.Y) { @@ -178,7 +178,7 @@ public class EditProfileUi : WindowMediatorSubscriberBase using (_uiSharedService.GameFont.Push()) { - var descriptionTextSizeLocal = ImGui.CalcTextSize(_descriptionText, 256f); + var descriptionTextSizeLocal = ImGui.CalcTextSize(_descriptionText, hideTextAfterDoubleHash: false, 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 5f0ebc4..b09965b 100644 --- a/MareSynchronos/UI/EventViewerUI.cs +++ b/MareSynchronos/UI/EventViewerUI.cs @@ -4,7 +4,7 @@ using Dalamud.Interface.Components; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; using Dalamud.Utility; -using ImGuiNET; +using Dalamud.Bindings.ImGui; using MareSynchronos.MareConfiguration; using MareSynchronos.Services; using MareSynchronos.Services.Events; diff --git a/MareSynchronos/UI/Handlers/UidDisplayHandler.cs b/MareSynchronos/UI/Handlers/UidDisplayHandler.cs index 056e78e..7f38b8a 100644 --- a/MareSynchronos/UI/Handlers/UidDisplayHandler.cs +++ b/MareSynchronos/UI/Handlers/UidDisplayHandler.cs @@ -1,10 +1,9 @@ using Dalamud.Interface; using Dalamud.Interface.Utility.Raii; -using ImGuiNET; +using Dalamud.Bindings.ImGui; using MareSynchronos.PlayerData.Pairs; using MareSynchronos.Services.ServerConfiguration; using MareSynchronos.MareConfiguration; -using ImGuiScene; using MareSynchronos.Services.Mediator; using MareSynchronos.UI.Components; @@ -22,7 +21,6 @@ public class UidDisplayHandler private string _lastMouseOverUid = string.Empty; private bool _popupShown = false; private DateTime? _popupTime; - private TextureWrap? _textureWrap; public UidDisplayHandler(MareMediator mediator, PairManager pairManager, ServerConfigurationManager serverManager, MareConfigService mareConfigService) @@ -96,8 +94,6 @@ public class UidDisplayHandler _mediator.Publish(new ProfilePopoutToggle(null)); _lastMouseOverUid = string.Empty; _popupShown = false; - _textureWrap?.Dispose(); - _textureWrap = null; } } diff --git a/MareSynchronos/UI/IntroUI.cs b/MareSynchronos/UI/IntroUI.cs index ca8055b..4644578 100644 --- a/MareSynchronos/UI/IntroUI.cs +++ b/MareSynchronos/UI/IntroUI.cs @@ -2,7 +2,7 @@ using Dalamud.Interface.Colors; using Dalamud.Interface.Utility; using Dalamud.Utility; -using ImGuiNET; +using Dalamud.Bindings.ImGui; using MareSynchronos.FileCache; using MareSynchronos.MareConfiguration; using MareSynchronos.MareConfiguration.Models; diff --git a/MareSynchronos/UI/PermissionWindowUI.cs b/MareSynchronos/UI/PermissionWindowUI.cs index 76b23f1..92f348b 100644 --- a/MareSynchronos/UI/PermissionWindowUI.cs +++ b/MareSynchronos/UI/PermissionWindowUI.cs @@ -1,6 +1,6 @@ using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; -using ImGuiNET; +using Dalamud.Bindings.ImGui; using MareSynchronos.API.Data.Enum; using MareSynchronos.API.Data.Extensions; using MareSynchronos.PlayerData.Pairs; diff --git a/MareSynchronos/UI/PlayerAnalysisUI.cs b/MareSynchronos/UI/PlayerAnalysisUI.cs index 7bc465b..a73614c 100644 --- a/MareSynchronos/UI/PlayerAnalysisUI.cs +++ b/MareSynchronos/UI/PlayerAnalysisUI.cs @@ -2,7 +2,7 @@ using Dalamud.Interface.Colors; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; -using ImGuiNET; +using Dalamud.Bindings.ImGui; using MareSynchronos.API.Data.Enum; using MareSynchronos.API.Data.Extensions; using MareSynchronos.Interop.Ipc; diff --git a/MareSynchronos/UI/PopoutProfileUi.cs b/MareSynchronos/UI/PopoutProfileUi.cs index 66636b0..afa2ddd 100644 --- a/MareSynchronos/UI/PopoutProfileUi.cs +++ b/MareSynchronos/UI/PopoutProfileUi.cs @@ -1,7 +1,7 @@ using Dalamud.Interface.Colors; using Dalamud.Interface.Textures.TextureWraps; using Dalamud.Interface.Utility; -using ImGuiNET; +using Dalamud.Bindings.ImGui; using MareSynchronos.API.Data.Extensions; using MareSynchronos.MareConfiguration; using MareSynchronos.PlayerData.Pairs; @@ -149,12 +149,12 @@ public class PopoutProfileUi : WindowMediatorSubscriberBase _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, hideTextAfterDoubleHash: false, 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]", hideTextAfterDoubleHash: false, 256f * ImGuiHelpers.GlobalScale); } UiSharedService.TextWrapped(trimmed ? descText + $"...{Environment.NewLine}[Open Full Profile for complete description]" : mareProfile.Description); @@ -167,12 +167,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 2722046..f4978e1 100644 --- a/MareSynchronos/UI/SettingsUi.cs +++ b/MareSynchronos/UI/SettingsUi.cs @@ -4,7 +4,7 @@ using Dalamud.Interface.Colors; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; using Dalamud.Utility; -using ImGuiNET; +using Dalamud.Bindings.ImGui; using MareSynchronos.API.Data; using MareSynchronos.API.Data.Comparer; using MareSynchronos.API.Dto.Account; diff --git a/MareSynchronos/UI/StandaloneProfileUi.cs b/MareSynchronos/UI/StandaloneProfileUi.cs index a7e3a9c..71cc6b5 100644 --- a/MareSynchronos/UI/StandaloneProfileUi.cs +++ b/MareSynchronos/UI/StandaloneProfileUi.cs @@ -2,7 +2,7 @@ using Dalamud.Interface.Colors; using Dalamud.Interface.Textures.TextureWraps; using Dalamud.Interface.Utility; -using ImGuiNET; +using Dalamud.Bindings.ImGui; using MareSynchronos.API.Data.Extensions; using MareSynchronos.PlayerData.Pairs; using MareSynchronos.Services; @@ -79,7 +79,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, hideTextAfterDoubleHash: false, 256f); var descriptionChildHeight = rectMax.Y - pos.Y - rectMin.Y - spacing.Y * 2; if (descriptionTextSize.Y > descriptionChildHeight && !_adjustedForScrollBars) { @@ -151,7 +151,7 @@ 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)); } catch (Exception ex) diff --git a/MareSynchronos/UI/SyncshellAdminUI.cs b/MareSynchronos/UI/SyncshellAdminUI.cs index e07c674..1dc5e40 100644 --- a/MareSynchronos/UI/SyncshellAdminUI.cs +++ b/MareSynchronos/UI/SyncshellAdminUI.cs @@ -2,7 +2,7 @@ using Dalamud.Interface.Colors; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; -using ImGuiNET; +using Dalamud.Bindings.ImGui; using MareSynchronos.API.Data.Enum; using MareSynchronos.API.Data.Extensions; using MareSynchronos.API.Dto.Group; diff --git a/MareSynchronos/UI/UISharedService.cs b/MareSynchronos/UI/UISharedService.cs index d402f79..15d895e 100644 --- a/MareSynchronos/UI/UISharedService.cs +++ b/MareSynchronos/UI/UISharedService.cs @@ -10,7 +10,7 @@ using Dalamud.Interface.Utility.Raii; using Dalamud.Plugin; using Dalamud.Plugin.Services; using Dalamud.Utility; -using ImGuiNET; +using Dalamud.Bindings.ImGui; using MareSynchronos.FileCache; using MareSynchronos.Interop.Ipc; using MareSynchronos.MareConfiguration; @@ -237,7 +237,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, hideTextAfterDoubleHash: false, 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/Penumbra.Api b/Penumbra.Api index 2cbf4ba..d8e0ad6 160000 --- a/Penumbra.Api +++ b/Penumbra.Api @@ -1 +1 @@ -Subproject commit 2cbf4bace53a5749d3eab1ff03025a6e6bd9fc37 +Subproject commit d8e0ad6ee2f68b6cd89d4230e6cedafdbbeea9cb