diff options
| author | Isaac Marovitz <42140194+IsaacMarovitz@users.noreply.github.com> | 2023-12-25 05:57:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-25 06:57:14 +0100 |
| commit | 19a949d0bf02fd5850d1222b2d51c3bc3e0e5670 (patch) | |
| tree | 70b7358beaf07057053c84e67f5531a8fc523178 /src/Ryujinx.Ava/UI/Models | |
| parent | feec5ef7b354e92bff03a846285af6bf4b8fb491 (diff) | |
Ava UI: Fix crash when clicking on a cheat's name (#5860)
* Fix crash
* Remove nullable
* Hide BuildId for child nodes
* Fix warning
* Fix charset
Diffstat (limited to 'src/Ryujinx.Ava/UI/Models')
| -rw-r--r-- | src/Ryujinx.Ava/UI/Models/CheatModel.cs | 40 | ||||
| -rw-r--r-- | src/Ryujinx.Ava/UI/Models/CheatNode.cs | 57 | ||||
| -rw-r--r-- | src/Ryujinx.Ava/UI/Models/CheatsList.cs | 51 |
3 files changed, 57 insertions, 91 deletions
diff --git a/src/Ryujinx.Ava/UI/Models/CheatModel.cs b/src/Ryujinx.Ava/UI/Models/CheatModel.cs deleted file mode 100644 index 3917d4b6..00000000 --- a/src/Ryujinx.Ava/UI/Models/CheatModel.cs +++ /dev/null @@ -1,40 +0,0 @@ -using Ryujinx.Ava.UI.ViewModels; -using System; - -namespace Ryujinx.Ava.UI.Models -{ - public class CheatModel : BaseModel - { - private bool _isEnabled; - - public event EventHandler<bool> EnableToggled; - - public CheatModel(string name, string buildId, bool isEnabled) - { - Name = name; - BuildId = buildId; - IsEnabled = isEnabled; - } - - public bool IsEnabled - { - get => _isEnabled; - set - { - _isEnabled = value; - - EnableToggled?.Invoke(this, _isEnabled); - - OnPropertyChanged(); - } - } - - public string BuildId { get; } - - public string BuildIdKey => $"{BuildId}-{Name}"; - - public string Name { get; } - - public string CleanName => Name[1..^7]; - } -} diff --git a/src/Ryujinx.Ava/UI/Models/CheatNode.cs b/src/Ryujinx.Ava/UI/Models/CheatNode.cs new file mode 100644 index 00000000..8e9aee25 --- /dev/null +++ b/src/Ryujinx.Ava/UI/Models/CheatNode.cs @@ -0,0 +1,57 @@ +using Ryujinx.Ava.UI.ViewModels; +using System.Collections.ObjectModel; +using System.Collections.Specialized; +using System.Linq; + +namespace Ryujinx.Ava.UI.Models +{ + public class CheatNode : BaseModel + { + private bool _isEnabled = false; + public ObservableCollection<CheatNode> SubNodes { get; } = new(); + public string CleanName => Name[1..^7]; + public string BuildIdKey => $"{BuildId}-{Name}"; + public bool IsRootNode { get; } + public string Name { get; } + public string BuildId { get; } + public string Path { get; } + public bool IsEnabled + { + get + { + if (SubNodes.Count > 0) + { + return SubNodes.ToList().TrueForAll(x => x.IsEnabled); + } + + return _isEnabled; + } + set + { + foreach (var cheat in SubNodes) + { + cheat.IsEnabled = value; + cheat.OnPropertyChanged(); + } + + _isEnabled = value; + } + } + + public CheatNode(string name, string buildId, string path, bool isRootNode, bool isEnabled = false) + { + Name = name; + BuildId = buildId; + Path = path; + IsEnabled = isEnabled; + IsRootNode = isRootNode; + + SubNodes.CollectionChanged += CheatsList_CollectionChanged; + } + + private void CheatsList_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e) + { + OnPropertyChanged(nameof(IsEnabled)); + } + } +} diff --git a/src/Ryujinx.Ava/UI/Models/CheatsList.cs b/src/Ryujinx.Ava/UI/Models/CheatsList.cs deleted file mode 100644 index abe8e4df..00000000 --- a/src/Ryujinx.Ava/UI/Models/CheatsList.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Linq; - -namespace Ryujinx.Ava.UI.Models -{ - public class CheatsList : ObservableCollection<CheatModel> - { - public CheatsList(string buildId, string path) - { - BuildId = buildId; - Path = path; - - CollectionChanged += CheatsList_CollectionChanged; - } - - public string BuildId { get; } - public string Path { get; } - - public bool IsEnabled - { - get - { - return this.ToList().TrueForAll(x => x.IsEnabled); - } - set - { - foreach (var cheat in this) - { - cheat.IsEnabled = value; - } - - OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsEnabled))); - } - } - - private void CheatsList_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e) - { - if (e.Action == NotifyCollectionChangedAction.Add) - { - (e.NewItems[0] as CheatModel).EnableToggled += Item_EnableToggled; - } - } - - private void Item_EnableToggled(object sender, bool e) - { - OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsEnabled))); - } - } -} |
