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

Fix panning Visject Surface with middle mouse button (right button does it) to prevent missed connections removals

Browse Source 
#2420
This commit is contained in:
Wojtek Figat
2024-04-15 14:34:53 +02:00
parent 00492a33a3
commit ed732a0189
1 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,11 @@ namespace FlaxEditor.Surface
/// </summary> /// </summary>
public readonly InputActionsContainer InputActions; public readonly InputActionsContainer InputActions;
/// <summary>
/// Optional feature.
/// </summary>
public bool PanWithMiddleMouse = false;
private string _currentInputText = string.Empty; private string _currentInputText = string.Empty;
private Float2 _movingNodesDelta; private Float2 _movingNodesDelta;
private HashSet<SurfaceNode> _movingNodes; private HashSet<SurfaceNode> _movingNodes;
@@ -223,15 +228,18 @@ namespace FlaxEditor.Surface
if (_middleMouseDown) if (_middleMouseDown)
{ {
// Calculate delta if (PanWithMiddleMouse)
var delta = location - _middleMouseDownPos;
if (delta.LengthSquared > 0.01f)
{ {
// Move view // Calculate delta
_mouseMoveAmount += delta.Length; var delta = location - _middleMouseDownPos;
_rootControl.Location += delta; if (delta.LengthSquared > 0.01f)
_middleMouseDownPos = location; {
Cursor = CursorType.SizeAll; // Move view
_mouseMoveAmount += delta.Length;
_rootControl.Location += delta;
_middleMouseDownPos = location;
Cursor = CursorType.SizeAll;
}
} }
// Handled // Handled
@@ -300,7 +308,8 @@ namespace FlaxEditor.Surface
if (_middleMouseDown) if (_middleMouseDown)
{ {
_middleMouseDown = false; _middleMouseDown = false;
Cursor = CursorType.Default; if (PanWithMiddleMouse)
Cursor = CursorType.Default;
} }
_isMovingSelection = false; _isMovingSelection = false;
ConnectingEnd(null); ConnectingEnd(null);
@@ -483,7 +492,7 @@ namespace FlaxEditor.Surface
Focus(); Focus();
return true; return true;
} }
if (_rightMouseDown || _middleMouseDown) if (_rightMouseDown || (_middleMouseDown && _middleMouseDown))
{ {
// Start navigating // Start navigating
StartMouseCapture(); StartMouseCapture();
@@ -555,9 +564,12 @@ namespace FlaxEditor.Surface
if (_middleMouseDown && button == MouseButton.Middle) if (_middleMouseDown && button == MouseButton.Middle)
{ {
_middleMouseDown = false; _middleMouseDown = false;
EndMouseCapture(); if (_middleMouseDown)
Cursor = CursorType.Default; {
if (_mouseMoveAmount > 0) EndMouseCapture();
Cursor = CursorType.Default;
}
if (_mouseMoveAmount > 0 && _middleMouseDown)
_mouseMoveAmount = 0; _mouseMoveAmount = 0;
else if (CanEdit) else if (CanEdit)
{ {