|
@@ -29,10 +29,12 @@ namespace InABox.DynamicGrid
|
|
|
public event EventHandler OnChanged;
|
|
|
|
|
|
private bool bChanged = false;
|
|
|
+ private bool _validated = false;
|
|
|
|
|
|
public void DoChanged()
|
|
|
{
|
|
|
bChanged = true;
|
|
|
+ _validated = false;
|
|
|
//OKButton.IsEnabled = true;
|
|
|
//CancelButton.IsEnabled = true;
|
|
|
OnChanged?.Invoke(this, EventArgs.Empty);
|
|
@@ -353,6 +355,8 @@ namespace InABox.DynamicGrid
|
|
|
"Validation Error");
|
|
|
return false;
|
|
|
}
|
|
|
+
|
|
|
+ _validated = true;
|
|
|
return true;
|
|
|
}
|
|
|
|
|
@@ -388,14 +392,15 @@ namespace InABox.DynamicGrid
|
|
|
//Close();
|
|
|
}
|
|
|
|
|
|
- public void SaveItem(CancelEventArgs e, bool validate = true)
|
|
|
+ public void SaveItem(CancelEventArgs e)
|
|
|
{
|
|
|
- if(validate && !Validate())
|
|
|
+ if(!_validated && !Validate())
|
|
|
{
|
|
|
e.Cancel = true;
|
|
|
return;
|
|
|
}
|
|
|
OnSaveItem?.Invoke(this, e);
|
|
|
+ _validated = false;
|
|
|
}
|
|
|
|
|
|
public bool TryFindEditor(string columnname, [NotNullWhen(true)] out IDynamicEditorControl? editor)
|