universaleditor/editor-legacy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dialog should inherit from CustomDialog, setting responsevalue on a button causes the dialog to close without processing the Click handler, and don't crash if we can't find a custom option control for that property

Browse Source
This commit is contained in:
Michael Becker 2020-03-19 10:59:59 -04:00
parent 9cdb8bb42b
commit 7a8aaf3967
No known key found for this signature in database
GPG Key ID: 389DFF5D73781A12
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/CustomOptionsDialog.cs
View File

@ -27,7 +27,7 @@ using MBS.Framework.UserInterface.Layouts;
namespace UniversalEditor.UserInterface.Dialogs
{
public class CustomOptionsDialog : Dialog
public class CustomOptionsDialog : CustomDialog
{
private Dictionary<string, Control> CustomOptionControls = new Dictionary<string, Control>();
@ -40,7 +40,7 @@ namespace UniversalEditor.UserInterface.Dialogs
Buttons.Add(cmdOK);
Buttons.Add(new Button(StockType.Cancel));
Buttons[0].ResponseValue = (int)DialogResult.OK;
// Buttons[0].ResponseValue = (int)DialogResult.OK;
Buttons[1].ResponseValue = (int)DialogResult.Cancel;
}
@ -266,6 +266,10 @@ namespace UniversalEditor.UserInterface.Dialogs
// Do not process invisible CustomOptions; this results in a crash
if (!eo.Visible) continue;
if (!CustomOptionControls.ContainsKey(eo.PropertyName))
{
continue;
}
Control ctl = CustomOptionControls[eo.PropertyName];
if (ctl is NumericTextBox)
@ -312,7 +316,7 @@ namespace UniversalEditor.UserInterface.Dialogs
return;
}
// this.DialogResult = DialogResult.OK;
this.DialogResult = DialogResult.OK;
this.Close();
}