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

Add minor changes

Browse Source
This commit is contained in:
Wojtek Figat
2022-01-04 23:56:54 +01:00
parent 32c7d36fcd
commit fa83869430
8 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Editor/GUI/Timeline/Media.cs
View File

@@ -91,7 +91,7 @@ namespace FlaxEditor.GUI.Timeline
/// <param name="media">The media.</param>
protected ProxyBase(TTrack track, TMedia media)
{
Track = track ?? throw new ArgumentNullException(nameof(track));
Track = track;
Media = media ?? throw new ArgumentNullException(nameof(media));
}
}
@@ -341,7 +341,7 @@ namespace FlaxEditor.GUI.Timeline
var style = Style.Current;
var bounds = new Rectangle(Vector2.Zero, Size);
var fillColor = style.Background * 1.5f;
var fillColor = BackgroundColor.A > 0.0f ? BackgroundColor : style.Background * 1.5f;
Render2D.FillRectangle(bounds, fillColor);
var isMovingWholeMedia = _isMoving && !_startMoveRightEdge && !_startMoveLeftEdge;

8
Source/Editor/GUI/Timeline/Timeline.cs
View File

@@ -1898,16 +1898,16 @@ namespace FlaxEditor.GUI.Timeline
media.OnTimelineShowContextMenu(menu, controlUnderMouse);
if (media.PropertiesEditObject != null)
{
menu.AddButton("Edit media", () => ShowEditPopup(media.PropertiesEditObject, ref location, media.Track));
menu.AddButton("Edit media", () => ShowEditPopup(media.PropertiesEditObject, location, media.Track));
}
}
if (PropertiesEditObject != null)
{
menu.AddButton("Edit timeline", () => ShowEditPopup(PropertiesEditObject, ref location, this));
menu.AddButton("Edit timeline", () => ShowEditPopup(PropertiesEditObject, location, this));
}
if (_tracks.Count > 1)
{
menu.AddButton("Sort tracks", SortTracks).TooltipText = "Sorts sub tracks alphabetically";
menu.AddButton("Sort tracks", SortTracks).TooltipText = "Sorts tracks alphabetically";
}
menu.AddSeparator();
menu.AddButton("Reset zoom", () => Zoom = 1.0f);
@@ -2089,7 +2089,7 @@ namespace FlaxEditor.GUI.Timeline
/// <param name="obj">The object.</param>
/// <param name="location">The show location (in timeline space).</param>
/// <param name="undoContext">The undo context object.</param>
protected virtual void ShowEditPopup(object obj, ref Vector2 location, object undoContext = null)
public virtual void ShowEditPopup(object obj, Vector2 location, object undoContext = null)
{
var popup = new PropertiesEditPopup(this, obj, undoContext);
popup.Show(this, location);

1
Source/Editor/Scripting/ScriptsBuilder.h
View File

@@ -4,7 +4,6 @@
#include "Engine/Core/Delegate.h"
#include "Engine/Core/Types/String.h"
#include "Engine/Core/Collections/Array.h"
#include "Engine/Scripting/ScriptingType.h"
/// <summary>