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

Merge pull request #215 from Aireil/fix_disable_new_line

Browse source 
Fix new line if no disable button
This commit is contained in:
goaaats 2020-12-13 21:00:14 +01:00 • committed by GitHub
commit b51d8858b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Dalamud/Plugin/PluginInstallerWindow.cs
View file

@ -372,13 +372,19 @@ namespace Dalamud.Plugin
ImGui.Text($"{command.Key} → {command.Value.HelpMessage}"); ImGui.Text($"{command.Key} → {command.Value.HelpMessage}");
} }
if (!installedPlugin.IsRaw && ImGui.Button(Loc.Localize("InstallerDisable", "Disable"))) { ImGui.NewLine();
try {
this.dalamud.PluginManager.DisablePlugin(installedPlugin.Definition); if (!installedPlugin.IsRaw) {
} catch (Exception exception) { ImGui.SameLine();
Log.Error(exception, "Could not disable plugin.");
this.errorModalDrawing = true; if (ImGui.Button(Loc.Localize("InstallerDisable", "Disable"))) {
this.errorModalOnNextFrame = true; try {
this.dalamud.PluginManager.DisablePlugin(installedPlugin.Definition);
} catch (Exception exception) {
Log.Error(exception, "Could not disable plugin.");
this.errorModalDrawing = true;
this.errorModalOnNextFrame = true;
}
} }
} }
@ -404,7 +410,8 @@ namespace Dalamud.Plugin
ImGui.TextColored(new Vector4(0.5f, 0.5f, 0.5f, 1.0f), $" v{pluginDefinition.AssemblyVersion}"); ImGui.TextColored(new Vector4(0.5f, 0.5f, 0.5f, 1.0f), $" v{pluginDefinition.AssemblyVersion}");
if(installedPlugin.IsRaw) { if(installedPlugin.IsRaw) {
ImGui.TextColored(new Vector4(1.0f, 0.0f, 0.0f, 1.0f), "To update or disable this plugin, please remove it from the devPlugins folder."); ImGui.SameLine();
ImGui.TextColored(new Vector4(1.0f, 0.0f, 0.0f, 1.0f), " To update or disable this plugin, please remove it from the devPlugins folder.");
} }
} }