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

pi: fix some leaked SameLine's

Browse source
This commit is contained in:
goat 2024-04-16 01:32:56 +02:00
parent 285d3bed42
commit b1a8ec7615
1 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2183,14 +2183,15 @@ internal class PluginInstallerWindow : Window, IDisposable
ImGuiHelpers.ScaledDummy(10); ImGuiHelpers.ScaledDummy(10);
ImGui.SameLine(); ImGui.SameLine();
this.DrawVisitRepoUrlButton(manifest.RepoUrl, true); if (this.DrawVisitRepoUrlButton(manifest.RepoUrl, true))
{
ImGui.SameLine(); ImGui.SameLine();
ImGuiHelpers.ScaledDummy(3); ImGuiHelpers.ScaledDummy(3);
ImGui.SameLine(); }
if (!manifest.SourceRepo.IsThirdParty && manifest.AcceptsFeedback) if (!manifest.SourceRepo.IsThirdParty && manifest.AcceptsFeedback)
{ {
ImGui.SameLine();
this.DrawSendFeedbackButton(manifest, false, true); this.DrawSendFeedbackButton(manifest, false, true);
} }
@ -2485,11 +2486,15 @@ internal class PluginInstallerWindow : Window, IDisposable
if (canFeedback) if (canFeedback)
{ {
ImGui.SameLine();
this.DrawSendFeedbackButton(plugin.Manifest, plugin.IsTesting, false); this.DrawSendFeedbackButton(plugin.Manifest, plugin.IsTesting, false);
} }
if (availablePluginUpdate != default && !plugin.IsDev) if (availablePluginUpdate != default && !plugin.IsDev)
{
ImGui.SameLine();
this.DrawUpdateSinglePluginButton(availablePluginUpdate); this.DrawUpdateSinglePluginButton(availablePluginUpdate);
}
ImGui.SameLine(); ImGui.SameLine();
ImGui.TextColored(ImGuiColors.DalamudGrey3, $" v{plugin.EffectiveVersion}"); ImGui.TextColored(ImGuiColors.DalamudGrey3, $" v{plugin.EffectiveVersion}");
@ -2501,7 +2506,7 @@ internal class PluginInstallerWindow : Window, IDisposable
ImGui.Unindent(); ImGui.Unindent();
if (!applicableChangelog.IsNullOrWhitespace()) if (hasChangelog)
{ {
if (ImGui.TreeNode(Locs.PluginBody_CurrentChangeLog(plugin.EffectiveVersion))) if (ImGui.TreeNode(Locs.PluginBody_CurrentChangeLog(plugin.EffectiveVersion)))
{ {
@ -2891,8 +2896,6 @@ internal class PluginInstallerWindow : Window, IDisposable
private void DrawUpdateSinglePluginButton(AvailablePluginUpdate update) private void DrawUpdateSinglePluginButton(AvailablePluginUpdate update)
{ {
ImGui.SameLine();
if (ImGuiComponents.IconButton(FontAwesomeIcon.Download)) if (ImGuiComponents.IconButton(FontAwesomeIcon.Download))
{ {
Task.Run(() => this.UpdateSinglePlugin(update)); Task.Run(() => this.UpdateSinglePlugin(update));
@ -2962,8 +2965,6 @@ internal class PluginInstallerWindow : Window, IDisposable
private void DrawSendFeedbackButton(IPluginManifest manifest, bool isTesting, bool big) private void DrawSendFeedbackButton(IPluginManifest manifest, bool isTesting, bool big)
{ {
ImGui.SameLine();
var clicked = big ? var clicked = big ?
ImGuiComponents.IconButtonWithText(FontAwesomeIcon.Comment, Locs.FeedbackModal_Title) : ImGuiComponents.IconButtonWithText(FontAwesomeIcon.Comment, Locs.FeedbackModal_Title) :
ImGuiComponents.IconButton(FontAwesomeIcon.Comment); ImGuiComponents.IconButton(FontAwesomeIcon.Comment);
@ -3208,7 +3209,7 @@ internal class PluginInstallerWindow : Window, IDisposable
} }
} }
private void DrawVisitRepoUrlButton(string? repoUrl, bool big) private bool DrawVisitRepoUrlButton(string? repoUrl, bool big)
{ {
if (!string.IsNullOrEmpty(repoUrl) && repoUrl.StartsWith("https://")) if (!string.IsNullOrEmpty(repoUrl) && repoUrl.StartsWith("https://"))
{ {
@ -3235,7 +3236,11 @@ internal class PluginInstallerWindow : Window, IDisposable
if (ImGui.IsItemHovered()) if (ImGui.IsItemHovered())
ImGui.SetTooltip(Locs.PluginButtonToolTip_VisitPluginUrl); ImGui.SetTooltip(Locs.PluginButtonToolTip_VisitPluginUrl);
return true;
} }
return false;
} }
private bool DrawPluginImages(LocalPlugin? plugin, IPluginManifest manifest, bool isThirdParty, int index) private bool DrawPluginImages(LocalPlugin? plugin, IPluginManifest manifest, bool isThirdParty, int index)