GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for array nodes in Visject

Browse Source
This commit is contained in:
Wojciech Figat
2021-11-19 16:04:13 +01:00
parent 3f3d8fc494
commit 52d79ca15a
3 changed files with 43 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Source/Editor/Surface/Elements/InputBox.cs
View File

@@ -928,8 +928,7 @@ namespace FlaxEditor.Surface.Elements
/// </summary>
public void UpdateDefaultValue()
{
var currentType = CurrentType.Type;
if (_defaultValueEditor != null && currentType != null)
if (_defaultValueEditor != null && _currentType.Type != null)
{
_editor.UpdateDefaultValue(this, _defaultValueEditor);
}
@@ -986,7 +985,7 @@ namespace FlaxEditor.Surface.Elements
{
base.OnCurrentTypeChanged();
if (_defaultValueEditor != null && !_editor.IsValid(this, _defaultValueEditor))
if (_defaultValueEditor != null && !(_editor.IsValid(this, _defaultValueEditor) && _editor.CanUse(this, ref _currentType)))
{
_defaultValueEditor.Dispose();
_defaultValueEditor = null;
@@ -1056,6 +1055,19 @@ namespace FlaxEditor.Surface.Elements
return base.OnMouseUp(location, button);
}
/// <inheritdoc />
public override void OnDestroy()
{
if (_defaultValueEditor != null)
{
_defaultValueEditor.Dispose();
_defaultValueEditor = null;
_editor = null;
}
base.OnDestroy();
}
private bool GetClipboardValue(out object result, bool deserialize)
{
@@ -1159,9 +1171,17 @@ namespace FlaxEditor.Surface.Elements
{
var bounds = new Rectangle(X + Width + 8 + Style.Current.FontSmall.MeasureText(Text).X, Y, 90, Height);
_editor = DefaultValueEditors[i];
_defaultValueEditor = _editor.Create(this, ref bounds);
if (_attributes != null)
_editor.UpdateAttributes(this, _attributes, _defaultValueEditor);
try
{
_defaultValueEditor = _editor.Create(this, ref bounds);
if (_attributes != null)
_editor.UpdateAttributes(this, _attributes, _defaultValueEditor);
}
catch (Exception ex)
{
Editor.LogWarning(ex);
_editor = null;
}
break;
}
}