ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-14 04:34:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

pi: always show available changelogs in "updateable" tab

Browse source
This commit is contained in:
goat 2024-07-20 01:37:34 +02:00
parent 05ec0b8c11
commit 58753a2725
1 changed files with 33 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

44
Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs
View file

@ -2624,7 +2624,24 @@ internal class PluginInstallerWindow : Window, IDisposable
var applicableChangelog = plugin.IsTesting ? remoteManifest?.Changelog : remoteManifest?.TestingChangelog; var applicableChangelog = plugin.IsTesting ? remoteManifest?.Changelog : remoteManifest?.TestingChangelog;
var hasChangelog = !applicableChangelog.IsNullOrWhitespace(); var hasChangelog = !applicableChangelog.IsNullOrWhitespace();
var didDrawChangelogInsideCollapsible = false; var didDrawApplicableChangelogInsideCollapsible = false;
Version? availablePluginUpdateVersion = null;
string? availableChangelog = null;
var didDrawAvailableChangelogInsideCollapsible = false;
if (availablePluginUpdate != default)
{
availablePluginUpdateVersion =
availablePluginUpdate.UseTesting ?
availablePluginUpdate.UpdateManifest.TestingAssemblyVersion :
availablePluginUpdate.UpdateManifest.AssemblyVersion;
availableChangelog =
availablePluginUpdate.UseTesting ?
availablePluginUpdate.UpdateManifest.TestingChangelog :
availablePluginUpdate.UpdateManifest.Changelog;
}
var flags = PluginHeaderFlags.None; var flags = PluginHeaderFlags.None;
if (plugin.IsThirdParty) if (plugin.IsThirdParty)
@ -2758,28 +2775,33 @@ internal class PluginInstallerWindow : Window, IDisposable
{ {
if (ImGui.TreeNode(Locs.PluginBody_CurrentChangeLog(plugin.EffectiveVersion))) if (ImGui.TreeNode(Locs.PluginBody_CurrentChangeLog(plugin.EffectiveVersion)))
{ {
didDrawChangelogInsideCollapsible = true; didDrawApplicableChangelogInsideCollapsible = true;
this.DrawInstalledPluginChangelog(applicableChangelog); this.DrawInstalledPluginChangelog(applicableChangelog);
ImGui.TreePop(); ImGui.TreePop();
} }
} }
if (availablePluginUpdate != default && !availablePluginUpdate.UpdateManifest.Changelog.IsNullOrWhitespace()) if (!availableChangelog.IsNullOrWhitespace() && ImGui.TreeNode(Locs.PluginBody_UpdateChangeLog(availablePluginUpdateVersion)))
{ {
var availablePluginUpdateVersion = availablePluginUpdate.UseTesting ? availablePluginUpdate.UpdateManifest.TestingAssemblyVersion : availablePluginUpdate.UpdateManifest.AssemblyVersion; this.DrawInstalledPluginChangelog(availableChangelog);
var availableChangelog = availablePluginUpdate.UseTesting ? availablePluginUpdate.UpdateManifest.TestingChangelog : availablePluginUpdate.UpdateManifest.Changelog; ImGui.TreePop();
if (!availableChangelog.IsNullOrWhitespace() && ImGui.TreeNode(Locs.PluginBody_UpdateChangeLog(availablePluginUpdateVersion))) didDrawAvailableChangelogInsideCollapsible = true;
{
this.DrawInstalledPluginChangelog(availableChangelog);
ImGui.TreePop();
}
} }
} }
if (thisWasUpdated && hasChangelog && !didDrawChangelogInsideCollapsible) if (thisWasUpdated &&
hasChangelog &&
!didDrawApplicableChangelogInsideCollapsible)
{ {
this.DrawInstalledPluginChangelog(applicableChangelog); this.DrawInstalledPluginChangelog(applicableChangelog);
} }
if (this.categoryManager.CurrentCategoryKind == PluginCategoryManager.CategoryKind.UpdateablePlugins &&
!availableChangelog.IsNullOrWhitespace() &&
!didDrawAvailableChangelogInsideCollapsible)
{
this.DrawInstalledPluginChangelog(availableChangelog);
}
ImGui.PopID(); ImGui.PopID();
} }