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

Minor cleanup

Browse Source
This commit is contained in:
Wojtek Figat
2023-08-27 16:36:37 +02:00
parent 94bd4d39f7
commit 3b163b6c4b
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Editor/GUI/Timeline/Tracks/AnimationEventTrack.cs
View File

@@ -308,9 +308,9 @@ namespace FlaxEditor.GUI.Timeline.Tracks
b.ButtonClicked += OnAddAnimEvent; b.ButtonClicked += OnAddAnimEvent;
} }
if (!addEvent.ContextMenu.Items.Any()) if (!addEvent.ContextMenu.Items.Any())
addEvent.ContextMenu.AddButton("No Anim Events Found.").CloseMenuOnClick = false; addEvent.ContextMenu.AddButton("No Anim Events found").CloseMenuOnClick = false;
if (!addContinuousEvent.ContextMenu.Items.Any()) if (!addContinuousEvent.ContextMenu.Items.Any())
addContinuousEvent.ContextMenu.AddButton("No Continuous Anim Events Found.").CloseMenuOnClick = false; addContinuousEvent.ContextMenu.AddButton("No Continuous Anim Events found").CloseMenuOnClick = false;
} }

10
Source/Editor/Windows/Assets/JsonAssetWindow.cs
View File

@@ -23,6 +23,7 @@ namespace FlaxEditor.Windows.Assets
private readonly Undo _undo; private readonly Undo _undo;
private object _object; private object _object;
private bool _isRegisteredForScriptsReload; private bool _isRegisteredForScriptsReload;
private Label _typeText;
/// <summary> /// <summary>
/// Gets the instance of the Json asset object that is being edited. /// Gets the instance of the Json asset object that is being edited.
@@ -137,16 +138,20 @@ namespace FlaxEditor.Windows.Assets
} }
_presenter.Select(_object); _presenter.Select(_object);
var typeText = new Label if (_typeText != null)
_typeText.Dispose();
var typeText = new ClickableLabel
{ {
Text = $"{Asset.DataTypeName}", Text = $"{Asset.DataTypeName}",
TooltipText = "The Asset Type.", TooltipText = "Asset data type (full name)",
AnchorPreset = AnchorPresets.TopRight, AnchorPreset = AnchorPresets.TopRight,
AutoWidth = true, AutoWidth = true,
Parent = this, Parent = this,
}; };
typeText.LocalX += -(typeText.Width + 4); typeText.LocalX += -(typeText.Width + 4);
typeText.LocalY += (_toolstrip.Height - typeText.Height) * 0.5f; typeText.LocalY += (_toolstrip.Height - typeText.Height) * 0.5f;
typeText.RightClick = () => Clipboard.Text = Asset.DataTypeName;
_typeText = typeText;
_undo.Clear(); _undo.Clear();
ClearEditedFlag(); ClearEditedFlag();
@@ -187,6 +192,7 @@ namespace FlaxEditor.Windows.Assets
_isRegisteredForScriptsReload = false; _isRegisteredForScriptsReload = false;
ScriptsBuilder.ScriptsReloadBegin -= OnScriptsReloadBegin; ScriptsBuilder.ScriptsReloadBegin -= OnScriptsReloadBegin;
} }
_typeText = null;
base.OnDestroy(); base.OnDestroy();
} }