Merge pull request #688 from goatcorp/endwalker

This commit is contained in:
goaaats 2021-12-03 17:50:04 +01:00 committed by GitHub
commit 4a69b5a6c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 25 deletions

View file

@ -387,16 +387,16 @@ namespace Dalamud.Interface.Internal.Windows
{
ImGui.Text(Locs.FeedbackModal_Text(this.feedbackPlugin.Name));
if (this.feedbackPlugin?.FeedbackMessage != null)
{
ImGui.TextWrapped(this.feedbackPlugin.FeedbackMessage);
}
if (this.feedbackPlugin?.FeedbackMessage != null)
{
ImGui.TextWrapped(this.feedbackPlugin.FeedbackMessage);
}
if (this.pluginListUpdatable.Any(
up => up.InstalledPlugin.Manifest.InternalName == this.feedbackPlugin?.InternalName))
{
ImGui.TextColored(ImGuiColors.DalamudRed, Locs.FeedbackModal_HasUpdate);
}
if (this.pluginListUpdatable.Any(
up => up.InstalledPlugin.Manifest.InternalName == this.feedbackPlugin?.InternalName))
{
ImGui.TextColored(ImGuiColors.DalamudRed, Locs.FeedbackModal_HasUpdate);
}
ImGui.Spacing();
@ -1231,10 +1231,10 @@ namespace Dalamud.Interface.Internal.Windows
this.DrawVisitRepoUrlButton(manifest.RepoUrl);
if (!manifest.SourceRepo.IsThirdParty && manifest.AcceptsFeedback)
{
this.DrawSendFeedbackButton(manifest);
}
if (!manifest.SourceRepo.IsThirdParty && manifest.AcceptsFeedback)
{
this.DrawSendFeedbackButton(manifest);
}
ImGuiHelpers.ScaledDummy(5);
@ -1405,8 +1405,8 @@ namespace Dalamud.Interface.Internal.Windows
ImGui.SameLine();
ImGui.TextColored(ImGuiColors.DalamudGrey3, downloadText);
var isThirdParty = manifest.IsThirdParty;
var canFeedback = !isThirdParty && !plugin.IsDev && plugin.Manifest.DalamudApiLevel == PluginManager.DalamudApiLevel && plugin.Manifest.AcceptsFeedback;
var isThirdParty = manifest.IsThirdParty;
var canFeedback = !isThirdParty && !plugin.IsDev && plugin.Manifest.DalamudApiLevel == PluginManager.DalamudApiLevel && plugin.Manifest.AcceptsFeedback;
// Installed from
if (plugin.IsDev)