ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-16 21:54:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Remove Assignment being visible for base and interface.

Browse source
This commit is contained in:
Ottermandias 2024-05-28 12:51:28 +02:00
parent 5d1b17f96d
commit f5d6ac8bdb
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Penumbra/Collections/Manager/CollectionType.cs
View file

@ -107,6 +107,9 @@ public static class CollectionTypeExtensions
public static bool IsSpecial(this CollectionType collectionType) public static bool IsSpecial(this CollectionType collectionType)
=> collectionType < CollectionType.Default; => collectionType < CollectionType.Default;
public static bool CanBeRemoved(this CollectionType collectionType)
=> collectionType.IsSpecial() || collectionType is CollectionType.Individual;
public static readonly (CollectionType, string, string)[] Special = Enum.GetValues<CollectionType>() public static readonly (CollectionType, string, string)[] Special = Enum.GetValues<CollectionType>()
.Where(IsSpecial) .Where(IsSpecial)
.Select(s => (s, s.ToName(), s.ToDescription())) .Select(s => (s, s.ToName(), s.ToDescription()))

2
Penumbra/UI/CollectionTab/CollectionPanel.cs
View file

@ -287,7 +287,7 @@ public sealed class CollectionPanel : IDisposable
_active.SetCollection(ModCollection.Empty, type, _active.Individuals.GetGroup(identifier)); _active.SetCollection(ModCollection.Empty, type, _active.Individuals.GetGroup(identifier));
} }
if (collection != null) if (collection != null && type.CanBeRemoved())
{ {
using var color = ImRaii.PushColor(ImGuiCol.Text, Colors.RegexWarningBorder); using var color = ImRaii.PushColor(ImGuiCol.Text, Colors.RegexWarningBorder);
if (ImGui.MenuItem("Remove this assignment.")) if (ImGui.MenuItem("Remove this assignment."))