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

Add zooming in curve editor relative to the mouse cursor and adapt to curve size

Browse Source
This commit is contained in:
Wojtek Figat
2024-11-29 14:33:46 +01:00
parent 8ee011c7f5
commit 9b43f2f03a
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -516,17 +516,25 @@ namespace FlaxEditor.GUI
var zoomAlt = RootWindow.GetKey(KeyboardKeys.Shift);
if (_editor.EnableZoom != UseMode.Off && IsMouseOver && !_leftMouseDown && (zoom || zoomAlt))
{
// TODO: preserve the view center point for easier zooming
var scale = new Float2(delta * 0.1f);
// Cache mouse location in curve-space
var viewRect = _editor._mainPanel.GetClientArea();
var locationInKeyframes = PointToKeyframes(location, ref viewRect);
var locationInEditorBefore = _editor.PointFromKeyframes(locationInKeyframes, ref viewRect);
// Scale relative to the curve size
var scale = new Float2(delta * 0.1f);
_editor._mainPanel.GetDesireClientArea(out var mainPanelArea);
var curveScale = mainPanelArea.Size / _editor._contents.Size;
scale *= curveScale;
if (zoomAlt)
scale.X = 0; // Scale Y axis only
_editor.ViewScale += GetUseModeMask(_editor.EnableZoom) * scale;
scale *= GetUseModeMask(_editor.EnableZoom); // Mask scale depending on allowed usage
_editor.ViewScale += scale;
// Zoom towards the mouse position
var locationInEditorAfter = _editor.PointFromKeyframes(locationInKeyframes, ref viewRect);
var locationInEditorDelta = locationInEditorAfter - locationInEditorBefore;
_editor.ViewOffset -= locationInEditorDelta;
return true;
}

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

@@ -266,9 +266,9 @@ namespace FlaxEngine.GUI
bool wasLocked = _isLayoutLocked;
_isLayoutLocked = true;
if (HScrollBar != null)
HScrollBar.Value = -value.X;
HScrollBar.TargetValue = -value.X;
if (VScrollBar != null)
VScrollBar.Value = -value.Y;
VScrollBar.TargetValue = -value.Y;
_isLayoutLocked = wasLocked;
base.SetViewOffset(ref value);