From 28fa041cbaab601a89fb249397342268b16bf4f8 Mon Sep 17 00:00:00 2001 From: Administrator Date: Sat, 9 Aug 2025 12:43:58 +0300 Subject: [PATCH] yes --- .../ReverseSearchDictBNpc.cs | 2 +- .../ReverseSearchDictCompanion.cs | 2 +- .../ReverseSearchDictENpc.cs | 2 +- .../ReverseSearchDictMount.cs | 2 +- CustomizePlus/Core/Helpers/CtrlHelper.cs | 6 +++--- CustomizePlus/Core/ServiceManagerBuilder.cs | 5 +++-- CustomizePlus/Core/Services/HookingService.cs | 10 +++++----- CustomizePlus/CustomizePlus.csproj | 12 ++++++++++-- CustomizePlus/CustomizePlus.json | 6 +++--- CustomizePlus/UI/UiHelpers.cs | 2 +- .../UI/Windows/Controls/ActorAssignmentUi.cs | 2 +- .../UI/Windows/Controls/PluginStateBlock.cs | 2 +- .../UI/Windows/Controls/TemplateCombo.cs | 5 +++-- .../UI/Windows/MainWindow/MainWindow.cs | 2 +- .../Windows/MainWindow/Tabs/Debug/IPCTestTab.cs | 2 +- .../MainWindow/Tabs/Debug/StateMonitoringTab.cs | 2 +- .../UI/Windows/MainWindow/Tabs/HeaderDrawer.cs | 2 +- .../Tabs/Profiles/ProfileFileSystemSelector.cs | 17 ++++++++++++++++- .../MainWindow/Tabs/Profiles/ProfilePanel.cs | 10 ++++++---- .../MainWindow/Tabs/Profiles/ProfilesTab.cs | 4 ++-- .../UI/Windows/MainWindow/Tabs/SettingsTab.cs | 2 +- .../Tabs/Templates/BoneEditorPanel.cs | 2 +- .../Templates/TemplateFileSystemSelector.cs | 15 ++++++++++++++- .../MainWindow/Tabs/Templates/TemplatePanel.cs | 2 +- .../MainWindow/Tabs/Templates/TemplatesTab.cs | 4 ++-- CustomizePlus/UI/Windows/PopupSystem.cs | 2 +- CustomizePlus/packages.lock.json | 8 ++++---- submodules/OtterGui | 2 +- submodules/Penumbra.Api | 2 +- submodules/Penumbra.GameData | 2 +- submodules/Penumbra.String | 2 +- 31 files changed, 90 insertions(+), 50 deletions(-) diff --git a/CustomizePlus.GameData/ReverseSearchDictionaries/ReverseSearchDictBNpc.cs b/CustomizePlus.GameData/ReverseSearchDictionaries/ReverseSearchDictBNpc.cs index 0180ecc..b251cdc 100644 --- a/CustomizePlus.GameData/ReverseSearchDictionaries/ReverseSearchDictBNpc.cs +++ b/CustomizePlus.GameData/ReverseSearchDictionaries/ReverseSearchDictBNpc.cs @@ -19,7 +19,7 @@ public sealed class ReverseSearchDictBNpc(IDalamudPluginInterface pluginInterfac var sheet = gameData.GetExcelSheet(gameData.Language)!; var dict = new Dictionary((int)sheet.Count); foreach (var n in sheet.Where(n => n.Singular.ByteLength > 0)) - dict.TryAdd(DataUtility.ToTitleCaseExtended(n.Singular, n.Article), n.RowId); + dict.TryAdd(DataUtility.ToTitleCaseExtended(n.Singular, (Dalamud.Game.ClientLanguage)n.Article), n.RowId); return dict.ToFrozenDictionary(); } diff --git a/CustomizePlus.GameData/ReverseSearchDictionaries/ReverseSearchDictCompanion.cs b/CustomizePlus.GameData/ReverseSearchDictionaries/ReverseSearchDictCompanion.cs index ff9e3a3..c4ed348 100644 --- a/CustomizePlus.GameData/ReverseSearchDictionaries/ReverseSearchDictCompanion.cs +++ b/CustomizePlus.GameData/ReverseSearchDictionaries/ReverseSearchDictCompanion.cs @@ -19,7 +19,7 @@ public sealed class ReverseSearchDictCompanion(IDalamudPluginInterface pluginInt var sheet = gameData.GetExcelSheet(gameData.Language)!; var dict = new Dictionary((int)sheet.Count); foreach (var c in sheet.Where(c => c.Singular.ByteLength > 0 && c.Order < ushort.MaxValue)) - dict.TryAdd(DataUtility.ToTitleCaseExtended(c.Singular, c.Article), c.RowId); + dict.TryAdd(DataUtility.ToTitleCaseExtended(c.Singular, (Dalamud.Game.ClientLanguage)c.Article), c.RowId); return dict.ToFrozenDictionary(); } diff --git a/CustomizePlus.GameData/ReverseSearchDictionaries/ReverseSearchDictENpc.cs b/CustomizePlus.GameData/ReverseSearchDictionaries/ReverseSearchDictENpc.cs index 42bf515..40ec3ef 100644 --- a/CustomizePlus.GameData/ReverseSearchDictionaries/ReverseSearchDictENpc.cs +++ b/CustomizePlus.GameData/ReverseSearchDictionaries/ReverseSearchDictENpc.cs @@ -19,7 +19,7 @@ public sealed class ReverseSearchDictENpc(IDalamudPluginInterface pluginInterfac var sheet = gameData.GetExcelSheet(gameData.Language)!; var dict = new Dictionary((int)sheet.Count); foreach (var n in sheet.Where(e => e.Singular.ByteLength > 0)) - dict.TryAdd(DataUtility.ToTitleCaseExtended(n.Singular, n.Article), n.RowId); + dict.TryAdd(DataUtility.ToTitleCaseExtended(n.Singular, (Dalamud.Game.ClientLanguage)n.Article), n.RowId); return dict.ToFrozenDictionary(); } diff --git a/CustomizePlus.GameData/ReverseSearchDictionaries/ReverseSearchDictMount.cs b/CustomizePlus.GameData/ReverseSearchDictionaries/ReverseSearchDictMount.cs index b22e760..46a323b 100644 --- a/CustomizePlus.GameData/ReverseSearchDictionaries/ReverseSearchDictMount.cs +++ b/CustomizePlus.GameData/ReverseSearchDictionaries/ReverseSearchDictMount.cs @@ -29,7 +29,7 @@ public sealed class ReverseSearchDictMount(IDalamudPluginInterface pluginInterfa { if (m.Singular.ByteLength > 0 && m.Order >= 0) { - dict.TryAdd(DataUtility.ToTitleCaseExtended(m.Singular, m.Article), m.RowId); + dict.TryAdd(DataUtility.ToTitleCaseExtended(m.Singular, (Dalamud.Game.ClientLanguage)m.Article), m.RowId); } else if (m.Unknown1.ByteLength > 0) { diff --git a/CustomizePlus/Core/Helpers/CtrlHelper.cs b/CustomizePlus/Core/Helpers/CtrlHelper.cs index a050099..52731fb 100644 --- a/CustomizePlus/Core/Helpers/CtrlHelper.cs +++ b/CustomizePlus/Core/Helpers/CtrlHelper.cs @@ -1,7 +1,7 @@ using System; using Dalamud.Interface; using Dalamud.Utility; -using ImGuiNET; +using Dalamud.Bindings.ImGui; namespace CustomizePlus.Core.Helpers; @@ -66,8 +66,8 @@ public static class CtrlHelper } public static bool ArrowToggle(string label, ref bool value) - { - var toggled = ImGui.ArrowButton(label, value ? ImGuiDir.Down : ImGuiDir.Right); + {//ImGuiNative.ArrowButton(label, value ? ImGuiDir.Down : ImGuiDir.Right); + var toggled = false; if (toggled) { diff --git a/CustomizePlus/Core/ServiceManagerBuilder.cs b/CustomizePlus/Core/ServiceManagerBuilder.cs index c92ee41..fc2bdec 100644 --- a/CustomizePlus/Core/ServiceManagerBuilder.cs +++ b/CustomizePlus/Core/ServiceManagerBuilder.cs @@ -25,6 +25,7 @@ using CustomizePlus.UI.Windows.MainWindow.Tabs.Debug; using CustomizePlus.UI.Windows.MainWindow.Tabs.Profiles; using CustomizePlus.UI.Windows.MainWindow.Tabs.Templates; using Dalamud.Plugin; +using Dalamud.Plugin.Services; using Microsoft.Extensions.DependencyInjection; using OtterGui.Classes; using OtterGui.Log; @@ -58,10 +59,10 @@ public static class ServiceManagerBuilder .AddApi(); DalamudServices.AddServices(services, pi); - + services.AddDalamudService(pi); services.AddIServices(typeof(EquipItem).Assembly); services.AddIServices(typeof(Plugin).Assembly); - services.AddIServices(typeof(CutsceneService).Assembly); + services.AddIServices(typeof(CutsceneService).Assembly); services.AddIServices(typeof(ImRaii).Assembly); services.CreateProvider(); diff --git a/CustomizePlus/Core/Services/HookingService.cs b/CustomizePlus/Core/Services/HookingService.cs index e93e2ae..edea53a 100644 --- a/CustomizePlus/Core/Services/HookingService.cs +++ b/CustomizePlus/Core/Services/HookingService.cs @@ -92,25 +92,25 @@ public class HookingService : IDisposable _logger.Debug("Render hook established"); } - if (_gameObjectMovementHook == null) + /*if (_gameObjectMovementHook == null) { var movementAddress = _sigScanner.ScanText(Constants.MovementHookAddress); _gameObjectMovementHook = _hooker.HookFromAddress(movementAddress, OnGameObjectMove); _logger.Debug("Movement hook established"); - } + }*/ _logger.Debug("Hooking render manager"); _renderManagerHook.Enable(); - _logger.Debug("Hooking movement functions"); - _gameObjectMovementHook.Enable(); + // _logger.Debug("Hooking movement functions"); + // _gameObjectMovementHook.Enable(); } else { _logger.Debug("Unhooking..."); _renderManagerHook?.Disable(); - _gameObjectMovementHook?.Disable(); + // _gameObjectMovementHook?.Disable(); } } catch (Exception e) diff --git a/CustomizePlus/CustomizePlus.csproj b/CustomizePlus/CustomizePlus.csproj index 4cba90b..5937f3e 100644 --- a/CustomizePlus/CustomizePlus.csproj +++ b/CustomizePlus/CustomizePlus.csproj @@ -1,9 +1,9 @@  - + CustomizePlus - 2.0.0.0 + 2.0.0.1 Customize+ https://github.com/Aether-Tools/CustomizePlus @@ -36,6 +36,10 @@ + + false + $(DalamudLibPath)\Dalamud.Bindings.ImGui.dll + @@ -44,6 +48,10 @@ + + + + diff --git a/CustomizePlus/CustomizePlus.json b/CustomizePlus/CustomizePlus.json index 52a5956..9c28d50 100644 --- a/CustomizePlus/CustomizePlus.json +++ b/CustomizePlus/CustomizePlus.json @@ -5,9 +5,9 @@ "Description": "A plugin that allows you to customize your character beyond FFXIV limitations by directly editing bone parameters.", "InternalName": "CustomizePlus", "ApplicableVersion": "any", - "AssemblyVersion": "2.0.0.0", - "DalamudApiLevel": 12, - "TestingDalamudApiLevel": 12, + "AssemblyVersion": "2.0.0.1", + "DalamudApiLevel": 13, + "TestingDalamudApiLevel": 13, "Tags": [ "Anamnesis", "Customization", diff --git a/CustomizePlus/UI/UiHelpers.cs b/CustomizePlus/UI/UiHelpers.cs index 313a468..1a441bc 100644 --- a/CustomizePlus/UI/UiHelpers.cs +++ b/CustomizePlus/UI/UiHelpers.cs @@ -1,5 +1,5 @@ using Dalamud.Interface.Utility; -using ImGuiNET; +using Dalamud.Bindings.ImGui; using System; using System.Collections.Generic; using System.Linq; diff --git a/CustomizePlus/UI/Windows/Controls/ActorAssignmentUi.cs b/CustomizePlus/UI/Windows/Controls/ActorAssignmentUi.cs index d50d3d2..daba8d7 100644 --- a/CustomizePlus/UI/Windows/Controls/ActorAssignmentUi.cs +++ b/CustomizePlus/UI/Windows/Controls/ActorAssignmentUi.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Dalamud.Game.ClientState.Objects.Enums; -using ImGuiNET; +using Dalamud.Bindings.ImGui; using OtterGui.Custom; using Penumbra.GameData.Actors; using Penumbra.GameData.DataContainers; diff --git a/CustomizePlus/UI/Windows/Controls/PluginStateBlock.cs b/CustomizePlus/UI/Windows/Controls/PluginStateBlock.cs index 1932802..026457f 100644 --- a/CustomizePlus/UI/Windows/Controls/PluginStateBlock.cs +++ b/CustomizePlus/UI/Windows/Controls/PluginStateBlock.cs @@ -1,6 +1,6 @@ using Dalamud.Interface.Utility; using Dalamud.Interface; -using ImGuiNET; +using Dalamud.Bindings.ImGui; using System.Numerics; using CustomizePlus.Core.Services; using CustomizePlus.Game.Services; diff --git a/CustomizePlus/UI/Windows/Controls/TemplateCombo.cs b/CustomizePlus/UI/Windows/Controls/TemplateCombo.cs index fd9c595..891286a 100644 --- a/CustomizePlus/UI/Windows/Controls/TemplateCombo.cs +++ b/CustomizePlus/UI/Windows/Controls/TemplateCombo.cs @@ -1,5 +1,5 @@ using Dalamud.Interface.Utility; -using ImGuiNET; +using Dalamud.Bindings.ImGui; using OtterGui.Classes; using OtterGui.Log; using OtterGui.Widgets; @@ -14,6 +14,7 @@ using CustomizePlus.Profiles; using CustomizePlus.Profiles.Data; using CustomizePlus.Templates.Events; using CustomizePlus.Templates.Data; +using OtterGui.Extensions; namespace CustomizePlus.UI.Windows.Controls; @@ -51,7 +52,7 @@ public abstract class TemplateComboBase : FilterComboCache 0 && design.Name != path) { var start = ImGui.GetItemRectMin(); - var pos = start.X + ImGui.CalcTextSize(design.Name).X; + var pos = start.X + ImGui.CalcTextSize((Dalamud.Bindings.ImGui.ImU8String)design.Name).X; var maxSize = ImGui.GetWindowPos().X + ImGui.GetWindowContentRegionMax().X; var remainingSpace = maxSize - pos; var requiredSize = ImGui.CalcTextSize(path).X + ImGui.GetStyle().ItemInnerSpacing.X; diff --git a/CustomizePlus/UI/Windows/MainWindow/MainWindow.cs b/CustomizePlus/UI/Windows/MainWindow/MainWindow.cs index 80c1988..7fbd676 100644 --- a/CustomizePlus/UI/Windows/MainWindow/MainWindow.cs +++ b/CustomizePlus/UI/Windows/MainWindow/MainWindow.cs @@ -1,6 +1,6 @@ using Dalamud.Interface.Windowing; using Dalamud.Plugin; -using ImGuiNET; +using Dalamud.Bindings.ImGui; using OtterGui.Raii; using System; using System.Numerics; diff --git a/CustomizePlus/UI/Windows/MainWindow/Tabs/Debug/IPCTestTab.cs b/CustomizePlus/UI/Windows/MainWindow/Tabs/Debug/IPCTestTab.cs index 33e14e0..d6f2382 100644 --- a/CustomizePlus/UI/Windows/MainWindow/Tabs/Debug/IPCTestTab.cs +++ b/CustomizePlus/UI/Windows/MainWindow/Tabs/Debug/IPCTestTab.cs @@ -2,7 +2,7 @@ using Dalamud.Plugin; using Dalamud.Plugin.Ipc; using Dalamud.Plugin.Services; -using ImGuiNET; +using Dalamud.Bindings.ImGui; using Newtonsoft.Json; using OtterGui.Raii; using System.Linq; diff --git a/CustomizePlus/UI/Windows/MainWindow/Tabs/Debug/StateMonitoringTab.cs b/CustomizePlus/UI/Windows/MainWindow/Tabs/Debug/StateMonitoringTab.cs index 6c669c2..21ee1d3 100644 --- a/CustomizePlus/UI/Windows/MainWindow/Tabs/Debug/StateMonitoringTab.cs +++ b/CustomizePlus/UI/Windows/MainWindow/Tabs/Debug/StateMonitoringTab.cs @@ -1,4 +1,4 @@ -using ImGuiNET; +using Dalamud.Bindings.ImGui; using System.Linq; using System; using CustomizePlus.Armatures.Data; diff --git a/CustomizePlus/UI/Windows/MainWindow/Tabs/HeaderDrawer.cs b/CustomizePlus/UI/Windows/MainWindow/Tabs/HeaderDrawer.cs index 7970619..8167567 100644 --- a/CustomizePlus/UI/Windows/MainWindow/Tabs/HeaderDrawer.cs +++ b/CustomizePlus/UI/Windows/MainWindow/Tabs/HeaderDrawer.cs @@ -1,6 +1,6 @@ using Dalamud.Interface.Utility; using Dalamud.Interface; -using ImGuiNET; +using Dalamud.Bindings.ImGui; using OtterGui; using System; using System.Linq; diff --git a/CustomizePlus/UI/Windows/MainWindow/Tabs/Profiles/ProfileFileSystemSelector.cs b/CustomizePlus/UI/Windows/MainWindow/Tabs/Profiles/ProfileFileSystemSelector.cs index 1aee4a5..e8641ec 100644 --- a/CustomizePlus/UI/Windows/MainWindow/Tabs/Profiles/ProfileFileSystemSelector.cs +++ b/CustomizePlus/UI/Windows/MainWindow/Tabs/Profiles/ProfileFileSystemSelector.cs @@ -1,6 +1,6 @@ using Dalamud.Interface; using Dalamud.Plugin.Services; -using ImGuiNET; +using Dalamud.Bindings.ImGui; using OtterGui.Classes; using OtterGui.FileSystem.Selector; using OtterGui.Filesystem; @@ -18,6 +18,7 @@ using CustomizePlus.Game.Services; using CustomizePlus.Profiles.Events; using CustomizePlus.GameData.Extensions; using System.Linq; +using OtterGui.Text; namespace CustomizePlus.UI.Windows.MainWindow.Tabs.Profiles; @@ -47,6 +48,20 @@ public class ProfileFileSystemSelector : FileSystemSelector 670 * ImUtf8.GlobalScale; + + + + protected override void SetSize(Vector2 size) + { + base.SetSize(size); + var adaptedSize = MathF.Round(size.X / ImUtf8.GlobalScale); + + } + public ProfileFileSystemSelector( ProfileFileSystem fileSystem, IKeyState keyState, diff --git a/CustomizePlus/UI/Windows/MainWindow/Tabs/Profiles/ProfilePanel.cs b/CustomizePlus/UI/Windows/MainWindow/Tabs/Profiles/ProfilePanel.cs index cbb0fef..c252f85 100644 --- a/CustomizePlus/UI/Windows/MainWindow/Tabs/Profiles/ProfilePanel.cs +++ b/CustomizePlus/UI/Windows/MainWindow/Tabs/Profiles/ProfilePanel.cs @@ -1,6 +1,6 @@ using Dalamud.Interface; using Dalamud.Interface.Utility; -using ImGuiNET; +using Dalamud.Bindings.ImGui; using OtterGui; using OtterGui.Raii; using System; @@ -19,6 +19,8 @@ using static FFXIVClientStructs.FFXIV.Client.LayoutEngine.ILayoutInstance; using CustomizePlus.GameData.Extensions; using CustomizePlus.Core.Extensions; using Dalamud.Interface.Components; +using OtterGui.Extensions; +using OtterGui.Text; namespace CustomizePlus.UI.Windows.MainWindow.Tabs.Profiles; @@ -66,7 +68,7 @@ public class ProfilePanel public void Draw() { - using var group = ImRaii.Group(); + using var group = ImUtf8.Group(); if (_selector.SelectedPaths.Count > 1) { DrawMultiSelection(); @@ -192,7 +194,7 @@ public class ProfilePanel { using (var table = ImRaii.Table("BasicSettings", 2)) { - ImGui.TableSetupColumn("BasicCol1", ImGuiTableColumnFlags.WidthFixed, ImGui.CalcTextSize("lorem ipsum dolor").X); + ImGui.TableSetupColumn("BasicCol1", ImGuiTableColumnFlags.WidthFixed, 200); ImGui.TableSetupColumn("BasicCol2", ImGuiTableColumnFlags.WidthStretch); ImGuiUtil.DrawFrameColumn("Profile Name"); @@ -504,7 +506,7 @@ public class ProfilePanel if (source) { ImGui.TextUnformatted($"Moving template #{index + 1:D2}..."); - if (ImGui.SetDragDropPayload(dragDropLabel, nint.Zero, 0)) + if (ImGui.SetDragDropPayload(dragDropLabel, ReadOnlySpan.Empty, 0)) { _dragIndex = index; } diff --git a/CustomizePlus/UI/Windows/MainWindow/Tabs/Profiles/ProfilesTab.cs b/CustomizePlus/UI/Windows/MainWindow/Tabs/Profiles/ProfilesTab.cs index 956878c..e540ea1 100644 --- a/CustomizePlus/UI/Windows/MainWindow/Tabs/Profiles/ProfilesTab.cs +++ b/CustomizePlus/UI/Windows/MainWindow/Tabs/Profiles/ProfilesTab.cs @@ -1,5 +1,5 @@ using Dalamud.Interface.Utility; -using ImGuiNET; +using Dalamud.Bindings.ImGui; namespace CustomizePlus.UI.Windows.MainWindow.Tabs.Profiles; @@ -16,7 +16,7 @@ public class ProfilesTab public void Draw() { - _selector.Draw(200f * ImGuiHelpers.GlobalScale); + _selector.Draw(); ImGui.SameLine(); _panel.Draw(); } diff --git a/CustomizePlus/UI/Windows/MainWindow/Tabs/SettingsTab.cs b/CustomizePlus/UI/Windows/MainWindow/Tabs/SettingsTab.cs index 223e31c..38584fb 100644 --- a/CustomizePlus/UI/Windows/MainWindow/Tabs/SettingsTab.cs +++ b/CustomizePlus/UI/Windows/MainWindow/Tabs/SettingsTab.cs @@ -1,6 +1,6 @@ using Dalamud.Interface; using Dalamud.Interface.Utility; -using ImGuiNET; +using Dalamud.Bindings.ImGui; using OtterGui.Classes; using OtterGui; using OtterGui.Raii; diff --git a/CustomizePlus/UI/Windows/MainWindow/Tabs/Templates/BoneEditorPanel.cs b/CustomizePlus/UI/Windows/MainWindow/Tabs/Templates/BoneEditorPanel.cs index 089bea9..434fbfc 100644 --- a/CustomizePlus/UI/Windows/MainWindow/Tabs/Templates/BoneEditorPanel.cs +++ b/CustomizePlus/UI/Windows/MainWindow/Tabs/Templates/BoneEditorPanel.cs @@ -1,6 +1,6 @@ using Dalamud.Interface.Components; using Dalamud.Interface; -using ImGuiNET; +using Dalamud.Bindings.ImGui; using System; using System.Collections.Generic; using System.Linq; diff --git a/CustomizePlus/UI/Windows/MainWindow/Tabs/Templates/TemplateFileSystemSelector.cs b/CustomizePlus/UI/Windows/MainWindow/Tabs/Templates/TemplateFileSystemSelector.cs index b34aac3..1584efb 100644 --- a/CustomizePlus/UI/Windows/MainWindow/Tabs/Templates/TemplateFileSystemSelector.cs +++ b/CustomizePlus/UI/Windows/MainWindow/Tabs/Templates/TemplateFileSystemSelector.cs @@ -1,6 +1,6 @@ using Dalamud.Interface; using Dalamud.Plugin.Services; -using ImGuiNET; +using Dalamud.Bindings.ImGui; using OtterGui; using OtterGui.Classes; using OtterGui.Filesystem; @@ -27,6 +27,7 @@ using CustomizePlus.Configuration.Helpers; using CustomizePlus.Configuration.Data.Version3; using CustomizePlus.Configuration.Data.Version2; using Dalamud.Interface.ImGuiNotification; +using OtterGui.Text; namespace CustomizePlus.UI.Windows.MainWindow.Tabs.Templates; @@ -65,6 +66,18 @@ public class TemplateFileSystemSelector : FileSystemSelector 670 * ImUtf8.GlobalScale; + + + + protected override void SetSize(Vector2 size) + { + base.SetSize(size); + var adaptedSize = MathF.Round(size.X / ImUtf8.GlobalScale); + + } public TemplateFileSystemSelector( TemplateFileSystem fileSystem, IKeyState keyState, diff --git a/CustomizePlus/UI/Windows/MainWindow/Tabs/Templates/TemplatePanel.cs b/CustomizePlus/UI/Windows/MainWindow/Tabs/Templates/TemplatePanel.cs index d4588bf..76b80bf 100644 --- a/CustomizePlus/UI/Windows/MainWindow/Tabs/Templates/TemplatePanel.cs +++ b/CustomizePlus/UI/Windows/MainWindow/Tabs/Templates/TemplatePanel.cs @@ -1,5 +1,5 @@ using Dalamud.Interface; -using ImGuiNET; +using Dalamud.Bindings.ImGui; using OtterGui; using OtterGui.Classes; using OtterGui.Raii; diff --git a/CustomizePlus/UI/Windows/MainWindow/Tabs/Templates/TemplatesTab.cs b/CustomizePlus/UI/Windows/MainWindow/Tabs/Templates/TemplatesTab.cs index a3e48b6..6a6e04a 100644 --- a/CustomizePlus/UI/Windows/MainWindow/Tabs/Templates/TemplatesTab.cs +++ b/CustomizePlus/UI/Windows/MainWindow/Tabs/Templates/TemplatesTab.cs @@ -1,5 +1,5 @@ using Dalamud.Interface.Utility; -using ImGuiNET; +using Dalamud.Bindings.ImGui; namespace CustomizePlus.UI.Windows.MainWindow.Tabs.Templates; @@ -16,7 +16,7 @@ public class TemplatesTab public void Draw() { - _selector.Draw(200f * ImGuiHelpers.GlobalScale); + _selector.Draw(); ImGui.SameLine(); _panel.Draw(); } diff --git a/CustomizePlus/UI/Windows/PopupSystem.cs b/CustomizePlus/UI/Windows/PopupSystem.cs index b525df9..1c8434f 100644 --- a/CustomizePlus/UI/Windows/PopupSystem.cs +++ b/CustomizePlus/UI/Windows/PopupSystem.cs @@ -1,5 +1,5 @@ using Dalamud.Interface.Utility; -using ImGuiNET; +using Dalamud.Bindings.ImGui; using OtterGui; using OtterGui.Log; using OtterGui.Raii; diff --git a/CustomizePlus/packages.lock.json b/CustomizePlus/packages.lock.json index e3a3200..4fcec27 100644 --- a/CustomizePlus/packages.lock.json +++ b/CustomizePlus/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", @@ -90,7 +90,7 @@ "type": "Project", "dependencies": { "OtterGui": "[1.0.0, )", - "Penumbra.Api": "[5.6.1, )", + "Penumbra.Api": "[5.10.0, )", "Penumbra.String": "[1.0.6, )" } }, diff --git a/submodules/OtterGui b/submodules/OtterGui index b4048fb..9523b7a 160000 --- a/submodules/OtterGui +++ b/submodules/OtterGui @@ -1 +1 @@ -Subproject commit b4048fb041902061ecfab07a10f27009250470ad +Subproject commit 9523b7ac725656b21fa98faef96962652e86e64f diff --git a/submodules/Penumbra.Api b/submodules/Penumbra.Api index f578091..c27a060 160000 --- a/submodules/Penumbra.Api +++ b/submodules/Penumbra.Api @@ -1 +1 @@ -Subproject commit f578091fa579fb098c21036b492ff6e6088184c9 +Subproject commit c27a06004138f2ec80ccdb494bb6ddf6d39d2165 diff --git a/submodules/Penumbra.GameData b/submodules/Penumbra.GameData index 801e98a..fd875c4 160000 --- a/submodules/Penumbra.GameData +++ b/submodules/Penumbra.GameData @@ -1 +1 @@ -Subproject commit 801e98a2956d707a25fd19bdfa46dc674c95365d +Subproject commit fd875c43ee910350107b2609809335285bd4ac0f diff --git a/submodules/Penumbra.String b/submodules/Penumbra.String index 2896c05..878acce 160000 --- a/submodules/Penumbra.String +++ b/submodules/Penumbra.String @@ -1 +1 @@ -Subproject commit 2896c0561f60827f97408650d52a15c38f4d9d10 +Subproject commit 878acce46e286867d6ef1f8ecedb390f7bac34fd