diff --git a/Dalamud/Dalamud.csproj b/Dalamud/Dalamud.csproj index 6d802f540..fd837896a 100644 --- a/Dalamud/Dalamud.csproj +++ b/Dalamud/Dalamud.csproj @@ -8,7 +8,7 @@ - 7.3.5.0 + 7.4.1.0 XIV Launcher addon framework $(DalamudVersion) $(DalamudVersion) diff --git a/Dalamud/Interface/Components/ImGuiComponents.IconButton.cs b/Dalamud/Interface/Components/ImGuiComponents.IconButton.cs index 7ef3f56e5..99e43d68c 100644 --- a/Dalamud/Interface/Components/ImGuiComponents.IconButton.cs +++ b/Dalamud/Interface/Components/ImGuiComponents.IconButton.cs @@ -26,6 +26,15 @@ public static partial class ImGuiComponents public static bool IconButton(int id, FontAwesomeIcon icon) => IconButton(id, icon, null, null, null); + /// + /// IconButton component to use an icon as a button. + /// + /// The ID of the button. + /// The icon for the button. + /// Indicator if button is clicked. + public static bool IconButton(string id, FontAwesomeIcon icon) + => IconButton(id, icon, null, null, null); + /// /// IconButton component to use an icon as a button. /// @@ -55,7 +64,19 @@ public static partial class ImGuiComponents /// The color of the button when hovered. /// Indicator if button is clicked. public static bool IconButton(int id, FontAwesomeIcon icon, Vector4? defaultColor = null, Vector4? activeColor = null, Vector4? hoveredColor = null) - => IconButton($"{icon.ToIconString()}{id}", defaultColor, activeColor, hoveredColor); + => IconButton($"{icon.ToIconString()}##{id}", defaultColor, activeColor, hoveredColor); + + /// + /// IconButton component to use an icon as a button with color options. + /// + /// The ID of the button. + /// The icon for the button. + /// The default color of the button. + /// The color of the button when active. + /// The color of the button when hovered. + /// Indicator if button is clicked. + public static bool IconButton(string id, FontAwesomeIcon icon, Vector4? defaultColor = null, Vector4? activeColor = null, Vector4? hoveredColor = null) + => IconButton($"{icon.ToIconString()}##{id}", defaultColor, activeColor, hoveredColor); /// /// IconButton component to use an icon as a button with color options. diff --git a/Dalamud/Interface/Internal/Windows/ChangelogWindow.cs b/Dalamud/Interface/Internal/Windows/ChangelogWindow.cs index ea1f7cd95..05854210e 100644 --- a/Dalamud/Interface/Internal/Windows/ChangelogWindow.cs +++ b/Dalamud/Interface/Internal/Windows/ChangelogWindow.cs @@ -18,12 +18,11 @@ internal sealed class ChangelogWindow : Window, IDisposable /// /// Whether the latest update warrants a changelog window. /// - public const string WarrantsChangelogForMajorMinor = "7.0."; + public const string WarrantsChangelogForMajorMinor = "7.4."; private const string ChangeLog = - @"• Updated Dalamud for compatibility with Patch 6.2 -• Made things more speedy -• Plugins can now be toggled off while remaining installed, instead of being removed completely + @"• Updated Dalamud for compatibility with Patch 6.3 +• Made things more speedy by updating to .NET 7 If you note any issues or need help, please check the FAQ, and reach out on our Discord if you need help. Thanks and have fun!"; diff --git a/Dalamud/Plugin/Internal/Types/LocalPlugin.cs b/Dalamud/Plugin/Internal/Types/LocalPlugin.cs index d01cc17e7..9d36a1644 100644 --- a/Dalamud/Plugin/Internal/Types/LocalPlugin.cs +++ b/Dalamud/Plugin/Internal/Types/LocalPlugin.cs @@ -225,6 +225,7 @@ internal class LocalPlugin : IDisposable /// Gets a value indicating whether or not this plugin is serviced(repo still exists, but plugin no longer does). /// public bool IsDecommissioned => !this.IsDev && + this.GetSourceRepository()?.State == PluginRepositoryState.Success && this.GetSourceRepository()?.PluginMaster?.FirstOrDefault(x => x.InternalName == this.Manifest.InternalName) == null; ///