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

Missing change for 05d477d6c8

Browse Source
This commit is contained in:
Wojtek Figat
2023-08-04 13:10:36 +02:00
parent 05d477d6c8
commit 73bbe63c1e
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Editor/Surface/VisjectSurface.Input.cs
View File

@@ -115,15 +115,23 @@ namespace FlaxEditor.Surface
var p1 = _rootControl.PointFromParent(ref _leftMouseDownPos);
var p2 = _rootControl.PointFromParent(ref _mousePos);
var selectionRect = Rectangle.FromPoints(p1, p2);
var selectionChanged = false;
// Find controls to select
for (int i = 0; i < _rootControl.Children.Count; i++)
{
if (_rootControl.Children[i] is SurfaceControl control)
{
control.IsSelected = control.IsSelectionIntersecting(ref selectionRect);
var select = control.IsSelectionIntersecting(ref selectionRect);
if (select != control.IsSelected)
{
control.IsSelected = select;
selectionChanged = true;
}
}
}
if (selectionChanged)
SelectionChanged?.Invoke();
}
private void OnSurfaceControlSpawned(SurfaceControl control)

16
Source/Editor/Surface/VisjectSurface.cs
View File

@@ -2,6 +2,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using FlaxEditor.GUI;
using FlaxEditor.GUI.Drag;
using FlaxEditor.Options;
@@ -600,7 +601,7 @@ namespace FlaxEditor.Surface
bool selectionChanged = false;
for (int i = 0; i < _rootControl.Children.Count; i++)
{
if (_rootControl.Children[i] is SurfaceControl control)
if (_rootControl.Children[i] is SurfaceControl control && control.IsSelected)
{
control.IsSelected = false;
selectionChanged = true;
@@ -652,11 +653,13 @@ namespace FlaxEditor.Surface
/// <param name="controls">The controls.</param>
public void Select(IEnumerable<SurfaceControl> controls)
{
var newSelection = controls.ToList();
var prevSelection = SelectedControls;
if (Utils.ArraysEqual(newSelection, prevSelection))
return;
ClearSelection();
foreach (var control in controls)
{
foreach (var control in newSelection)
control.IsSelected = true;
}
SelectionChanged?.Invoke();
}
@@ -666,6 +669,8 @@ namespace FlaxEditor.Surface
/// <param name="control">The control.</param>
public void Deselect(SurfaceControl control)
{
if (!control.IsSelected)
return;
control.IsSelected = false;
SelectionChanged?.Invoke();
}
@@ -724,11 +729,8 @@ namespace FlaxEditor.Surface
Context.OnControlDeleted(control);
}
}
if (selectionChanged)
{
SelectionChanged?.Invoke();
}
if (nodes != null)
{