chizui/Il2CppInspectorRedux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Plugins: Don't force validation on disabled options

Browse Source
This commit is contained in:
Katy Coe
2020-12-28 23:10:29 +01:00
parent 99f1c38b4c
commit 84b3b5f9a7
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Il2CppInspector.Common/Plugins/API/V100/IPluginOption.cs
View File

@@ -95,6 +95,12 @@ namespace Il2CppInspector.PluginAPI.V100
public T Value { public T Value {
get => _value; get => _value;
set { set {
// Disabled options can be set to invalid values
if (!If()) {
_value = value;
return;
}
// Perform internal validation // Perform internal validation
InternalValidate(value); InternalValidate(value);

14
Il2CppInspector.GUI/PluginConfigurationDialog.xaml.cs
View File

@@ -109,7 +109,11 @@ namespace Il2CppInspectorGUI
// Remove event // Remove event
lstOptions.ItemContainerGenerator.StatusChanged -= OptionsListBoxStatusChanged; lstOptions.ItemContainerGenerator.StatusChanged -= OptionsListBoxStatusChanged;
// your items are now generated // Validate all options
ValidateAllOptions();
}
private void ValidateAllOptions() {
// Adapted from https://stackoverflow.com/a/18008545 // Adapted from https://stackoverflow.com/a/18008545
foreach (var item in lstOptions.Items) { foreach (var item in lstOptions.Items) {
var listBoxItem = lstOptions.ItemContainerGenerator.ContainerFromItem(item); var listBoxItem = lstOptions.ItemContainerGenerator.ContainerFromItem(item);
@@ -236,14 +240,18 @@ namespace Il2CppInspectorGUI
if (lstOptions.ItemContainerGenerator.Status != GeneratorStatus.ContainersGenerated) if (lstOptions.ItemContainerGenerator.Status != GeneratorStatus.ContainersGenerated)
return; return;
foreach (var item in lstOptions.Items) { // Update If binding for all options
foreach (IPluginOption item in lstOptions.Items) {
var listBoxItem = lstOptions.ItemContainerGenerator.ContainerFromItem(item); var listBoxItem = lstOptions.ItemContainerGenerator.ContainerFromItem(item);
var presenter = FindVisualChild<ContentPresenter>(listBoxItem); var presenter = FindVisualChild<ContentPresenter>(listBoxItem);
var dataTemplate = presenter.ContentTemplateSelector.SelectTemplate(item, listBoxItem); var dataTemplate = presenter.ContentTemplateSelector.SelectTemplate(item, listBoxItem);
if (dataTemplate.FindName("optionPanel", presenter) is FrameworkElement boundControl) if (dataTemplate.FindName("optionPanel", presenter) is FrameworkElement boundControl)
boundControl.IsEnabled = ((IPluginOption) item).If(); boundControl.IsEnabled = item.If();
} }
// Remove validation errors for disabled options
ValidateAllOptions();
} }
} }
} }