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

Merge remote-tracking branch 'origin/master' into 1.6

Browse Source
This commit is contained in:
Wojtek Figat
2023-05-05 11:41:32 +02:00
parent 238526bdc4 de1ba2de6f
commit 22239bc2d1
15 changed files with 96 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Editor/GUI/Timeline/Tracks/ActorTrack.cs
View File

@@ -174,7 +174,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks
continue;
// Prevent from adding the same track twice
if (SubTracks.Any(x => x is IObjectTrack y && y.Object == script))
if (SubTracks.Any(x => x is IObjectTrack y && y.Object as SceneObject == script))
continue;
var name = Utilities.Utils.GetPropertyNameUI(script.GetType().Name);

5
Source/Editor/GUI/Tree/TreeNode.cs
View File

@@ -661,17 +661,20 @@ namespace FlaxEditor.GUI.Tree
// Draw drag and drop effect
if (IsDragOver && _tree.DraggedOverNode == this)
{
Color dragOverColor = style.BackgroundSelected * 0.6f;
Color dragOverColor = style.BackgroundSelected;
Rectangle rect;
switch (_dragOverMode)
{
case DragItemPositioning.At:
dragOverColor *= 0.6f;
rect = textRect;
break;
case DragItemPositioning.Above:
dragOverColor *= 1.2f;
rect = new Rectangle(textRect.X, textRect.Top - DefaultDragInsertPositionMargin - DefaultNodeOffsetY - _margin.Top, textRect.Width, DefaultDragInsertPositionMargin * 2.0f);
break;
case DragItemPositioning.Below:
dragOverColor *= 1.2f;
rect = new Rectangle(textRect.X, textRect.Bottom + _margin.Bottom - DefaultDragInsertPositionMargin, textRect.Width, DefaultDragInsertPositionMargin * 2.0f);
break;
default: