From d10a6dab82599d05a38a9653e906a377427a8203 Mon Sep 17 00:00:00 2001 From: Raymond Date: Sun, 3 Oct 2021 11:09:52 -0400 Subject: [PATCH 1/8] implicit types --- Dalamud/Interface/Internal/PluginCategoryManager.cs | 8 ++++---- .../Internal/Windows/PluginInstallerWindow.cs | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Dalamud/Interface/Internal/PluginCategoryManager.cs b/Dalamud/Interface/Internal/PluginCategoryManager.cs index bccd58162..b7a6a6d6c 100644 --- a/Dalamud/Interface/Internal/PluginCategoryManager.cs +++ b/Dalamud/Interface/Internal/PluginCategoryManager.cs @@ -149,10 +149,10 @@ namespace Dalamud.Interface.Internal foreach (var tag in pluginCategoryTags) { // only tags from whitelist can be accepted - int matchIdx = Array.FindIndex(this.CategoryList, x => x.Tag.Equals(tag, StringComparison.InvariantCultureIgnoreCase)); + var matchIdx = Array.FindIndex(this.CategoryList, x => x.Tag.Equals(tag, StringComparison.InvariantCultureIgnoreCase)); if (matchIdx >= 0) { - int categoryId = this.CategoryList[matchIdx].CategoryId; + var categoryId = this.CategoryList[matchIdx].CategoryId; if (categoryId >= FirstTagBasedCategoryId) { categoryList.Add(categoryId); @@ -202,7 +202,7 @@ namespace Dalamud.Interface.Internal { var groupInfo = this.groupList[this.currentGroupIdx]; - bool includeAll = (this.currentCategoryIdx == 0) || (groupInfo.GroupKind != GroupKind.Available); + var includeAll = (this.currentCategoryIdx == 0) || (groupInfo.GroupKind != GroupKind.Available); if (includeAll) { result.AddRange(plugins); @@ -215,7 +215,7 @@ namespace Dalamud.Interface.Internal { if (this.mapPluginCategories.TryGetValue(plugin, out var pluginCategoryIds)) { - int matchIdx = Array.IndexOf(pluginCategoryIds, selectedCategoryInfo.CategoryId); + var matchIdx = Array.IndexOf(pluginCategoryIds, selectedCategoryInfo.CategoryId); if (matchIdx >= 0) { result.Add(plugin); diff --git a/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs b/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs index d9c3156f9..02f0a3247 100644 --- a/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs +++ b/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs @@ -610,10 +610,10 @@ namespace Dalamud.Interface.Internal.Windows private void DrawPluginCategories() { - float useContentHeight = -40; // button height + spacing - float useMenuWidth = 180; // works fine as static value, table can be resized by user + var useContentHeight = -40f; // button height + spacing + var useMenuWidth = 180f; // works fine as static value, table can be resized by user - float useContentWidth = ImGui.GetContentRegionAvail().X; + var useContentWidth = ImGui.GetContentRegionAvail().X; if (ImGui.BeginChild("InstallerCategories", new Vector2(useContentWidth, useContentHeight * ImGuiHelpers.GlobalScale))) { @@ -654,7 +654,7 @@ namespace Dalamud.Interface.Internal.Windows } } - for (int groupIdx = 0; groupIdx < this.categoryManager.GroupList.Length; groupIdx++) + for (var groupIdx = 0; groupIdx < this.categoryManager.GroupList.Length; groupIdx++) { var groupInfo = this.categoryManager.GroupList[groupIdx]; var canShowGroup = (groupInfo.GroupKind != PluginCategoryManager.GroupKind.DevTools) || this.hasDevPlugins; @@ -673,11 +673,11 @@ namespace Dalamud.Interface.Internal.Windows ImGui.Indent(); var categoryItemSize = new Vector2(ImGui.GetContentRegionAvail().X - (5 * ImGuiHelpers.GlobalScale), ImGui.GetTextLineHeight()); - for (int categoryIdx = 0; categoryIdx < groupInfo.Categories.Count; categoryIdx++) + for (var categoryIdx = 0; categoryIdx < groupInfo.Categories.Count; categoryIdx++) { var categoryInfo = Array.Find(this.categoryManager.CategoryList, x => x.CategoryId == groupInfo.Categories[categoryIdx]); - bool hasSearchHighlight = this.categoryManager.IsCategoryHighlighted(categoryInfo.CategoryId); + var hasSearchHighlight = this.categoryManager.IsCategoryHighlighted(categoryInfo.CategoryId); if (hasSearchHighlight) { ImGui.PushStyleColor(ImGuiCol.Text, colorSearchHighlight); From 8b31936fd927fbb72777e84d97efe13925c60326 Mon Sep 17 00:00:00 2001 From: Raymond Date: Fri, 1 Oct 2021 21:57:35 -0400 Subject: [PATCH 2/8] fix scrollbar not showing --- Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs b/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs index 02f0a3247..feac3e368 100644 --- a/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs +++ b/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs @@ -628,7 +628,7 @@ namespace Dalamud.Interface.Internal.Windows this.DrawPluginCategorySelectors(); ImGui.TableNextColumn(); - if (ImGui.BeginChild($"ScrollingPlugins", new Vector2(useContentWidth, 0), false, ImGuiWindowFlags.HorizontalScrollbar | ImGuiWindowFlags.NoBackground)) + if (ImGui.BeginChild("ScrollingPlugins", new Vector2(-1, 0), false, ImGuiWindowFlags.HorizontalScrollbar | ImGuiWindowFlags.NoBackground)) { this.DrawPluginCategoryContent(); ImGui.EndChild(); From e7f29cb43147b9bb262a23fb5ae7001953d4dca2 Mon Sep 17 00:00:00 2001 From: Raymond Date: Sun, 3 Oct 2021 10:04:07 -0400 Subject: [PATCH 3/8] EndChild outside Begin --- Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs b/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs index feac3e368..0aaa44dd0 100644 --- a/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs +++ b/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs @@ -195,7 +195,6 @@ namespace Dalamud.Interface.Internal.Windows public override void Draw() { this.DrawHeader(); - // this.DrawPluginTabBar(); this.DrawPluginCategories(); this.DrawFooter(); this.DrawErrorModal(); @@ -631,9 +630,9 @@ namespace Dalamud.Interface.Internal.Windows if (ImGui.BeginChild("ScrollingPlugins", new Vector2(-1, 0), false, ImGuiWindowFlags.HorizontalScrollbar | ImGuiWindowFlags.NoBackground)) { this.DrawPluginCategoryContent(); - ImGui.EndChild(); } + ImGui.EndChild(); ImGui.EndTable(); } From 3801a7fb1399b9e20ead32f1e6b4904239c9cf5d Mon Sep 17 00:00:00 2001 From: Raymond Date: Sun, 3 Oct 2021 10:54:31 -0400 Subject: [PATCH 4/8] Remove nulls from image1-5 array --- .../Interface/Internal/Windows/PluginInstallerWindow.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs b/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs index 0aaa44dd0..c5ad221b0 100644 --- a/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs +++ b/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs @@ -2165,6 +2165,10 @@ namespace Dalamud.Interface.Internal.Windows if (didAny) { Log.Verbose($"Plugin images for {manifest.InternalName} loaded from disk"); + + if (pluginImages.Contains(null)) + pluginImages = pluginImages.Where(image => image != null).ToArray(); + this.pluginImagesMap[manifest.InternalName] = pluginImages; return; @@ -2217,6 +2221,10 @@ namespace Dalamud.Interface.Internal.Windows if (didAny) { Log.Verbose($"Plugin images for {manifest.InternalName} downloaded"); + + if (pluginImages.Contains(null)) + pluginImages = pluginImages.Where(image => image != null).ToArray(); + this.pluginImagesMap[manifest.InternalName] = pluginImages; return; From c3d4d525943ff7447917aa9cd602c093a73aec46 Mon Sep 17 00:00:00 2001 From: Raymond Date: Sun, 3 Oct 2021 11:09:42 -0400 Subject: [PATCH 5/8] comment unused methods --- Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs b/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs index c5ad221b0..8bf4a57ba 100644 --- a/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs +++ b/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs @@ -469,6 +469,7 @@ namespace Dalamud.Interface.Internal.Windows } } + /* private void DrawPluginTabBar() { ImGui.SetCursorPosY(ImGui.GetCursorPosY() - (5 * ImGuiHelpers.GlobalScale)); @@ -489,7 +490,9 @@ namespace Dalamud.Interface.Internal.Windows ImGui.PopStyleVar(); } + */ + /* private void DrawPluginTab(string title, Action drawPluginList) { if (ImGui.BeginTabItem(title)) @@ -510,6 +513,7 @@ namespace Dalamud.Interface.Internal.Windows ImGui.EndTabItem(); } } + */ private void DrawAvailablePluginList() { From 893ca93e02979a9408e53cf992e2c48f96be9777 Mon Sep 17 00:00:00 2001 From: Raymond Date: Sun, 3 Oct 2021 11:14:42 -0400 Subject: [PATCH 6/8] Put ItemSpacing from DrawPluginTabBar into category view --- Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs b/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs index 8bf4a57ba..73e5f99b9 100644 --- a/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs +++ b/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs @@ -715,6 +715,8 @@ namespace Dalamud.Interface.Internal.Windows return; } + ImGui.PushStyleVar(ImGuiStyleVar.ItemSpacing, ImGuiHelpers.ScaledVector2(1, 3)); + var groupInfo = this.categoryManager.GroupList[this.categoryManager.CurrentGroupIdx]; if (groupInfo.GroupKind == PluginCategoryManager.GroupKind.DevTools) { @@ -776,6 +778,8 @@ namespace Dalamud.Interface.Internal.Windows ImGui.Text(Locs.TabBody_SearchNoCompatible); } } + + ImGui.PopStyleVar(); } private void DrawImageTester() From 4b98ea31ccadeb585971fd66c457851ad77e80d6 Mon Sep 17 00:00:00 2001 From: Raymond Date: Sun, 3 Oct 2021 11:27:31 -0400 Subject: [PATCH 7/8] Merge category code into preexisting method Keep installed plugins after installation in available tab. --- .../Internal/Windows/PluginInstallerWindow.cs | 58 +++++-------------- 1 file changed, 16 insertions(+), 42 deletions(-) diff --git a/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs b/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs index 73e5f99b9..e359bbffe 100644 --- a/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs +++ b/Dalamud/Interface/Internal/Windows/PluginInstallerWindow.cs @@ -525,30 +525,38 @@ namespace Dalamud.Interface.Internal.Windows return; } - var filteredList = pluginList + var filteredManifests = pluginList .Where(rm => !this.IsManifestFiltered(rm)) .ToList(); - if (filteredList.Count == 0) + if (filteredManifests.Count == 0) { ImGui.TextColored(ImGuiColors.DalamudGrey2, Locs.TabBody_SearchNoMatching); return; } - var i = 0; - foreach (var manifest in filteredList) + // reset opened list of collapsibles when switching between categories + if (this.categoryManager.IsContentDirty) { - var (isInstalled, plugin) = this.IsManifestInstalled(manifest); + this.openPluginCollapsibles.Clear(); + } + + var categoryManifestsList = this.categoryManager.GetCurrentCategoryContent(filteredManifests); + + var i = 0; + foreach (var manifest in categoryManifestsList) + { + var remoteManifest = manifest as RemotePluginManifest; + var (isInstalled, plugin) = this.IsManifestInstalled(remoteManifest); ImGui.PushID($"{manifest.InternalName}{manifest.AssemblyVersion}"); - if (isInstalled) { this.DrawInstalledPlugin(plugin, i++, true); } else { - this.DrawAvailablePlugin(manifest, i++); + this.DrawAvailablePlugin(remoteManifest, i++); } ImGui.PopID(); @@ -742,41 +750,7 @@ namespace Dalamud.Interface.Internal.Windows } else { - var pluginList = this.pluginListAvailable; - if (pluginList.Count > 0) - { - // reset opened list of collapsibles when switching between categories - if (this.categoryManager.IsContentDirty) - { - this.openPluginCollapsibles.Clear(); - } - - var filteredManifests = pluginList.Where(rm => !this.IsManifestFiltered(rm) && !this.IsManifestInstalled(rm).IsInstalled); - var categoryManifestsList = this.categoryManager.GetCurrentCategoryContent(filteredManifests); - - if (categoryManifestsList.Count > 0) - { - var i = 0; - foreach (var manifest in categoryManifestsList) - { - var rmManifest = manifest as RemotePluginManifest; - if (rmManifest != null) - { - ImGui.PushID($"{rmManifest.InternalName}{rmManifest.AssemblyVersion}"); - this.DrawAvailablePlugin(rmManifest, i++); - ImGui.PopID(); - } - } - } - else - { - ImGui.Text(Locs.TabBody_SearchNoMatching); - } - } - else - { - ImGui.Text(Locs.TabBody_SearchNoCompatible); - } + this.DrawAvailablePluginList(); } ImGui.PopStyleVar(); From 59b4ac7610fd7fa20cfbb2b9f55875fe7fa361e8 Mon Sep 17 00:00:00 2001 From: Raymond Date: Tue, 5 Oct 2021 06:29:37 -0400 Subject: [PATCH 8/8] Fix docstrings --- Dalamud/Plugin/DalamudPluginInterface.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dalamud/Plugin/DalamudPluginInterface.cs b/Dalamud/Plugin/DalamudPluginInterface.cs index 3d872029b..d3f416404 100644 --- a/Dalamud/Plugin/DalamudPluginInterface.cs +++ b/Dalamud/Plugin/DalamudPluginInterface.cs @@ -165,11 +165,11 @@ namespace Dalamud.Plugin #region IPC /// - /// Gets an IPC publisher. + /// Gets an IPC provider. /// /// The return type for funcs. Use object if this is unused. /// The name of the IPC registration. - /// An IPC publisher. + /// An IPC provider. /// This is thrown when the requested types do not match the previously registered types are different. public ICallGateProvider GetIpcProvider(string name) => new CallGatePubSub(name); @@ -211,7 +211,7 @@ namespace Dalamud.Plugin /// /// The return type for funcs. Use object if this is unused. /// The name of the IPC registration. - /// An IPC publisher. + /// An IPC subscriber. public ICallGateSubscriber GetIpcSubscriber(string name) => new CallGatePubSub(name);