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

Fix mouse focus issue with Timeline background

Browse Source
This commit is contained in:
Wojtek Figat
2021-12-22 20:39:45 +01:00
parent cc3617b5c2
commit a83d223eec
1 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
Source/Editor/GUI/Timeline/GUI/Background.cs
View File

@@ -16,8 +16,8 @@ namespace FlaxEditor.GUI.Timeline.GUI
private readonly Timeline _timeline;
private float[] _tickSteps;
private float[] _tickStrengths;
private bool _leftMouseDown;
private Vector2 _leftMouseDownPos = Vector2.Minimum;
private bool _isSelecting;
private Vector2 _selectingStartPos = Vector2.Minimum;
private Vector2 _mousePos = Vector2.Minimum;
/// <summary>
@@ -33,7 +33,7 @@ namespace FlaxEditor.GUI.Timeline.GUI
private void UpdateSelectionRectangle()
{
var selectionRect = Rectangle.FromPoints(_leftMouseDownPos, _mousePos);
var selectionRect = Rectangle.FromPoints(_selectingStartPos, _mousePos);
_timeline.OnKeyframesSelection(null, this, selectionRect);
}
@@ -41,20 +41,17 @@ namespace FlaxEditor.GUI.Timeline.GUI
public override bool OnMouseDown(Vector2 location, MouseButton button)
{
if (base.OnMouseDown(location, button))
{
_leftMouseDown = false;
return true;
}
_mousePos = location;
if (button == MouseButton.Left)
{
// Start selecting
_leftMouseDown = true;
_leftMouseDownPos = location;
StartMouseCapture();
_isSelecting = true;
_selectingStartPos = location;
_timeline.OnKeyframesDeselect(null);
Focus();
StartMouseCapture();
return true;
}
@@ -65,19 +62,16 @@ namespace FlaxEditor.GUI.Timeline.GUI
public override bool OnMouseUp(Vector2 location, MouseButton button)
{
_mousePos = location;
if (_leftMouseDown && button == MouseButton.Left)
if (_isSelecting && button == MouseButton.Left)
{
// End selecting
_leftMouseDown = false;
_isSelecting = false;
EndMouseCapture();
return true;
}
if (base.OnMouseUp(location, button))
{
_leftMouseDown = false;
return true;
}
return true;
}
@@ -88,7 +82,7 @@ namespace FlaxEditor.GUI.Timeline.GUI
_mousePos = location;
// Selecting
if (_leftMouseDown)
if (_isSelecting)
{
UpdateSelectionRectangle();
return;
@@ -100,11 +94,24 @@ namespace FlaxEditor.GUI.Timeline.GUI
/// <inheritdoc />
public override void OnLostFocus()
{
_leftMouseDown = false;
if (_isSelecting)
{
_isSelecting = false;
EndMouseCapture();
}
base.OnLostFocus();
}
/// <inheritdoc />
public override void OnEndMouseCapture()
{
_isSelecting = false;
EndMouseCapture();
base.OnEndMouseCapture();
}
/// <inheritdoc />
public override bool IntersectsContent(ref Vector2 locationParent, out Vector2 location)
{
@@ -217,9 +224,9 @@ namespace FlaxEditor.GUI.Timeline.GUI
}
// Draw selection rectangle
if (_leftMouseDown)
if (_isSelecting)
{
var selectionRect = Rectangle.FromPoints(_leftMouseDownPos, _mousePos);
var selectionRect = Rectangle.FromPoints(_selectingStartPos, _mousePos);
Render2D.FillRectangle(selectionRect, Color.Orange * 0.4f);
Render2D.DrawRectangle(selectionRect, Color.Orange);
}