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

Fixed colors in mod selector not automatically updating

Browse source
This commit is contained in:
Ottermandias 2022-06-04 00:52:33 +02:00
parent ea4d087ae9
commit 4b58213597
2 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Penumbra/UI/Classes/ModFileSystemSelector.Filters.cs
View file

@ -18,7 +18,7 @@ public partial class ModFileSystemSelector
[StructLayout( LayoutKind.Sequential, Pack = 1 )] [StructLayout( LayoutKind.Sequential, Pack = 1 )]
public struct ModState public struct ModState
{ {
public uint Color; public ColorId Color;
} }
private const StringComparison IgnoreCase = StringComparison.InvariantCultureIgnoreCase; private const StringComparison IgnoreCase = StringComparison.InvariantCultureIgnoreCase;
@ -102,32 +102,32 @@ public partial class ModFileSystemSelector
} }
// Only get the text color for a mod if no filters are set. // Only get the text color for a mod if no filters are set.
private uint GetTextColor( Mod mod, ModSettings? settings, ModCollection collection ) private static ColorId GetTextColor( Mod mod, ModSettings? settings, ModCollection collection )
{ {
if( Penumbra.ModManager.NewMods.Contains( mod ) ) if( Penumbra.ModManager.NewMods.Contains( mod ) )
{ {
return ColorId.NewMod.Value(); return ColorId.NewMod;
} }
if( settings == null ) if( settings == null )
{ {
return ColorId.UndefinedMod.Value(); return ColorId.UndefinedMod;
} }
if( !settings.Enabled ) if( !settings.Enabled )
{ {
return collection != Penumbra.CollectionManager.Current ? ColorId.InheritedDisabledMod.Value() : ColorId.DisabledMod.Value(); return collection != Penumbra.CollectionManager.Current ? ColorId.InheritedDisabledMod : ColorId.DisabledMod;
} }
var conflicts = Penumbra.CollectionManager.Current.Conflicts( mod ); var conflicts = Penumbra.CollectionManager.Current.Conflicts( mod );
if( conflicts.Count == 0 ) if( conflicts.Count == 0 )
{ {
return collection != Penumbra.CollectionManager.Current ? ColorId.InheritedMod.Value() : ColorId.EnabledMod.Value(); return collection != Penumbra.CollectionManager.Current ? ColorId.InheritedMod : ColorId.EnabledMod;
} }
return conflicts.Any( c => !c.Solved ) return conflicts.Any( c => !c.Solved )
? ColorId.ConflictingMod.Value() ? ColorId.ConflictingMod
: ColorId.HandledConflictMod.Value(); : ColorId.HandledConflictMod;
} }
private bool CheckStateFilters( Mod mod, ModSettings? settings, ModCollection collection, ref ModState state ) private bool CheckStateFilters( Mod mod, ModSettings? settings, ModCollection collection, ref ModState state )
@ -153,7 +153,7 @@ public partial class ModFileSystemSelector
} }
else else
{ {
state.Color = ColorId.InheritedMod.Value(); state.Color = ColorId.InheritedMod;
if( !_stateFilter.HasFlag( ModFilter.Inherited ) ) if( !_stateFilter.HasFlag( ModFilter.Inherited ) )
{ {
return true; return true;
@ -163,7 +163,7 @@ public partial class ModFileSystemSelector
// Handle settings. // Handle settings.
if( settings == null ) if( settings == null )
{ {
state.Color = ColorId.UndefinedMod.Value(); state.Color = ColorId.UndefinedMod;
if( !_stateFilter.HasFlag( ModFilter.Undefined ) if( !_stateFilter.HasFlag( ModFilter.Undefined )
|| !_stateFilter.HasFlag( ModFilter.Disabled ) || !_stateFilter.HasFlag( ModFilter.Disabled )
|| !_stateFilter.HasFlag( ModFilter.NoConflict ) ) || !_stateFilter.HasFlag( ModFilter.NoConflict ) )
@ -173,7 +173,7 @@ public partial class ModFileSystemSelector
} }
else if( !settings.Enabled ) else if( !settings.Enabled )
{ {
state.Color = collection == Penumbra.CollectionManager.Current ? ColorId.DisabledMod.Value() : ColorId.InheritedDisabledMod.Value(); state.Color = collection == Penumbra.CollectionManager.Current ? ColorId.DisabledMod : ColorId.InheritedDisabledMod;
if( !_stateFilter.HasFlag( ModFilter.Disabled ) if( !_stateFilter.HasFlag( ModFilter.Disabled )
|| !_stateFilter.HasFlag( ModFilter.NoConflict ) ) || !_stateFilter.HasFlag( ModFilter.NoConflict ) )
{ {
@ -198,7 +198,7 @@ public partial class ModFileSystemSelector
return true; return true;
} }
state.Color = ColorId.ConflictingMod.Value(); state.Color = ColorId.ConflictingMod;
} }
else else
{ {
@ -207,7 +207,7 @@ public partial class ModFileSystemSelector
return true; return true;
} }
state.Color = ColorId.HandledConflictMod.Value(); state.Color = ColorId.HandledConflictMod;
} }
} }
else if( !_stateFilter.HasFlag( ModFilter.NoConflict ) ) else if( !_stateFilter.HasFlag( ModFilter.NoConflict ) )
@ -219,7 +219,7 @@ public partial class ModFileSystemSelector
// isNew color takes precedence before other colors. // isNew color takes precedence before other colors.
if( isNew ) if( isNew )
{ {
state.Color = ColorId.NewMod.Value(); state.Color = ColorId.NewMod;
} }
return false; return false;
@ -228,7 +228,7 @@ public partial class ModFileSystemSelector
// Combined wrapper for handling all filters and setting state. // Combined wrapper for handling all filters and setting state.
private bool ApplyFiltersAndState( ModFileSystem.Leaf leaf, out ModState state ) private bool ApplyFiltersAndState( ModFileSystem.Leaf leaf, out ModState state )
{ {
state = new ModState { Color = ColorId.EnabledMod.Value() }; state = new ModState { Color = ColorId.EnabledMod };
var mod = leaf.Value; var mod = leaf.Value;
var (settings, collection) = Penumbra.CollectionManager.Current[ mod.Index ]; var (settings, collection) = Penumbra.CollectionManager.Current[ mod.Index ];

2
Penumbra/UI/Classes/ModFileSystemSelector.cs
View file

@ -107,7 +107,7 @@ public sealed partial class ModFileSystemSelector : FileSystemSelector< Mod, Mod
protected override void DrawLeafName( FileSystem< Mod >.Leaf leaf, in ModState state, bool selected ) protected override void DrawLeafName( FileSystem< Mod >.Leaf leaf, in ModState state, bool selected )
{ {
var flags = selected ? ImGuiTreeNodeFlags.Selected | LeafFlags : LeafFlags; var flags = selected ? ImGuiTreeNodeFlags.Selected | LeafFlags : LeafFlags;
using var c = ImRaii.PushColor( ImGuiCol.Text, state.Color ); using var c = ImRaii.PushColor( ImGuiCol.Text, state.Color.Value() );
using var id = ImRaii.PushId( leaf.Value.Index ); using var id = ImRaii.PushId( leaf.Value.Index );
using var _ = ImRaii.TreeNode( leaf.Value.Name, flags ); using var _ = ImRaii.TreeNode( leaf.Value.Name, flags );
} }