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

Merge branch 'prop-lock-select' of https://github.com/Tryibion/FlaxEngine into Tryibion-prop-lock-select

Browse Source
This commit is contained in:
Wojtek Figat
2025-04-07 22:26:42 +02:00
parent 4a10905464 d0ad0859ea
commit 8b5c35ac6d
2 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Editor/Windows/Assets/PrefabWindow.cs
View File

@@ -45,6 +45,8 @@ namespace FlaxEditor.Windows.Assets
private DateTime _modifiedTime = DateTime.MinValue; private DateTime _modifiedTime = DateTime.MinValue;
private bool _isDropping = false; private bool _isDropping = false;
private bool _lockSelection = false;
/// <summary> /// <summary>
/// Gets the prefab hierarchy tree control. /// Gets the prefab hierarchy tree control.
/// </summary> /// </summary>
@@ -76,7 +78,18 @@ namespace FlaxEditor.Windows.Assets
/// <summary> /// <summary>
/// Indication of if the prefab window selection is locked on specific objects. /// Indication of if the prefab window selection is locked on specific objects.
/// </summary> /// </summary>
public bool LockSelectedObjects = false; public bool LockSelectedObjects
{
get => _lockSelection;
set
{
if (_lockSelection == value)
return;
_lockSelection = value;
if (!value)
OnSelectionChanged(Graph.Root.SceneContext.Selection.ToArray());
}
}
/// <summary> /// <summary>
/// Gets or sets a value indicating whether use live reloading for the prefab changes (applies prefab changes on modification by auto). /// Gets or sets a value indicating whether use live reloading for the prefab changes (applies prefab changes on modification by auto).

14
Source/Editor/Windows/PropertiesWindow.cs
View File

@@ -22,6 +22,7 @@ namespace FlaxEditor.Windows
private IEnumerable<object> undoRecordObjects; private IEnumerable<object> undoRecordObjects;
private readonly Dictionary<Guid, float> _actorScrollValues = new Dictionary<Guid, float>(); private readonly Dictionary<Guid, float> _actorScrollValues = new Dictionary<Guid, float>();
private bool _lockObjects = false;
/// <inheritdoc /> /// <inheritdoc />
public override bool UseLayoutData => true; public override bool UseLayoutData => true;
@@ -44,7 +45,18 @@ namespace FlaxEditor.Windows
/// <summary> /// <summary>
/// Indication of if the properties window is locked on specific objects. /// Indication of if the properties window is locked on specific objects.
/// </summary> /// </summary>
public bool LockObjects = false; public bool LockObjects
{
get => _lockObjects;
set
{
if (value == _lockObjects)
return;
_lockObjects = value;
if (!value)
OnSelectionChanged();
}
}
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="PropertiesWindow"/> class. /// Initializes a new instance of the <see cref="PropertiesWindow"/> class.