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

fix: imgui namespace for duplicate internalname

Browse source
This commit is contained in:
goat 2020-12-26 01:59:16 +01:00
parent 1e2b2a00a4
commit a69253d5ac
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Dalamud/Plugin/PluginInstallerWindow.cs
View file

@ -263,7 +263,9 @@ namespace Dalamud.Plugin
var didAnyWithSearch = false; var didAnyWithSearch = false;
var hasSearchString = !string.IsNullOrWhiteSpace(this.searchText); var hasSearchString = !string.IsNullOrWhiteSpace(this.searchText);
foreach (var pluginDefinition in pluginDefinitions) { for (var index = 0; index < pluginDefinitions.Count; index++) {
var pluginDefinition = pluginDefinitions[index];
if (pluginDefinition.ApplicableVersion != this.gameVersion && if (pluginDefinition.ApplicableVersion != this.gameVersion &&
pluginDefinition.ApplicableVersion != "any") pluginDefinition.ApplicableVersion != "any")
continue; continue;
@ -317,7 +319,7 @@ namespace Dalamud.Plugin
if (isTestingAvailable) if (isTestingAvailable)
label += " (testing version)"; label += " (testing version)";
ImGui.PushID(pluginDefinition.InternalName + pluginDefinition.AssemblyVersion); ImGui.PushID(pluginDefinition.InternalName + pluginDefinition.AssemblyVersion + installed + index);
if (ImGui.CollapsingHeader(pluginDefinition.Name + label + "###Header" + pluginDefinition.InternalName) if (ImGui.CollapsingHeader(pluginDefinition.Name + label + "###Header" + pluginDefinition.InternalName)
) { ) {
@ -328,8 +330,11 @@ namespace Dalamud.Plugin
ImGui.SameLine(); ImGui.SameLine();
var info = $" by {pluginDefinition.Author}"; var info = $" by {pluginDefinition.Author}";
info += pluginDefinition.DownloadCount != 0 ? $", {pluginDefinition.DownloadCount} downloads" : ", download count unavailable"; info += pluginDefinition.DownloadCount != 0
if (pluginDefinition.FromRepo != "goatcorp.github.io" && !string.IsNullOrWhiteSpace(pluginDefinition.FromRepo)) ? $", {pluginDefinition.DownloadCount} downloads"
: ", download count unavailable";
if (pluginDefinition.FromRepo != "goatcorp.github.io" &&
!string.IsNullOrWhiteSpace(pluginDefinition.FromRepo))
info += $", from {pluginDefinition.FromRepo}"; info += $", from {pluginDefinition.FromRepo}";
ImGui.TextColored(new Vector4(0.5f, 0.5f, 0.5f, 1.0f), info); ImGui.TextColored(new Vector4(0.5f, 0.5f, 0.5f, 1.0f), info);
@ -421,9 +426,10 @@ namespace Dalamud.Plugin
ImGui.SameLine(); ImGui.SameLine();
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.SameLine(); 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."); 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.");
} }
} }