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

Fix curve editor panning to be stable

Browse Source
This commit is contained in:
Wojtek Figat
2024-11-30 23:20:57 +01:00
parent 77184c7b52
commit 44d96ad100
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Source/Editor/GUI/CurveEditor.Contents.cs
View File

@@ -28,6 +28,7 @@ namespace FlaxEditor.GUI
internal Float2 _mousePos = Float2.Minimum;
internal bool _isMovingSelection;
internal bool _isMovingTangent;
internal bool _movedView;
internal bool _movedKeyframes;
private TangentPoint _movingTangent;
private Float2 _movingSelectionStart;
@@ -189,17 +190,20 @@ namespace FlaxEditor.GUI
// Moving view
if (_rightMouseDown)
{
var delta = location - _movingViewLastPos;
var movingViewPos = Parent.PointToParent(PointToParent(location));
var delta = movingViewPos - _movingViewLastPos;
if (_editor.CustomViewPanning != null)
delta = _editor.CustomViewPanning(delta);
delta *= GetUseModeMask(_editor.EnablePanning) * _editor.ViewScale;
delta *= GetUseModeMask(_editor.EnablePanning);
if (delta.LengthSquared > 0.01f)
{
_editor._mainPanel.ViewOffset += delta;
_movingViewLastPos = location;
_movingViewLastPos = movingViewPos;
_movedView = true;
if (_editor.CustomViewPanning != null)
{
Cursor = CursorType.SizeAll;
if (Cursor == CursorType.Default)
Cursor = CursorType.SizeAll;
}
else
{
@@ -292,7 +296,8 @@ namespace FlaxEditor.GUI
{
_rightMouseDown = true;
_rightMouseDownPos = location;
_movingViewLastPos = location;
_movedView = false;
_movingViewLastPos = Parent.PointToParent(PointToParent(location));
}
// Check if any node is under the mouse
@@ -437,7 +442,7 @@ namespace FlaxEditor.GUI
Cursor = CursorType.Default;
// Check if no move has been made at all
if (Float2.Distance(ref location, ref _rightMouseDownPos) < 2.0f)
if (!_movedView)
{
var selectionCount = _editor.SelectionCount;
var point = GetChildAt(location) as KeyframePoint;

6
Source/Engine/UI/GUI/Panels/Panel.cs
View File

@@ -263,15 +263,21 @@ namespace FlaxEngine.GUI
/// <inheritdoc />
protected override void SetViewOffset(ref Float2 value)
{
// Update scroll bars but with locked layout
bool wasLocked = _isLayoutLocked;
int layoutUpdateLock = _layoutUpdateLock;
_isLayoutLocked = true;
_layoutUpdateLock = 999;
if (HScrollBar != null)
HScrollBar.TargetValue = -value.X;
if (VScrollBar != null)
VScrollBar.TargetValue = -value.Y;
_layoutUpdateLock = layoutUpdateLock;
_isLayoutLocked = wasLocked;
base.SetViewOffset(ref value);
PerformLayout();
}
/// <summary>