Merge branch 'xxSeys1-FixCloseButtonAfterIBrokeIt'
This commit is contained in:
@@ -225,6 +225,10 @@ namespace FlaxEditor.Surface
|
|||||||
|
|
||||||
_rootControl.DrawComments();
|
_rootControl.DrawComments();
|
||||||
|
|
||||||
|
// Reset input flags here because this is the closest to Update we have
|
||||||
|
WasBoxSelecting = IsBoxSelecting;
|
||||||
|
WasMovingSelection = IsMovingSelection;
|
||||||
|
|
||||||
if (IsBoxSelecting)
|
if (IsBoxSelecting)
|
||||||
{
|
{
|
||||||
DrawSelection();
|
DrawSelection();
|
||||||
|
|||||||
@@ -590,9 +590,6 @@ namespace FlaxEditor.Surface
|
|||||||
// Cache flags and state
|
// Cache flags and state
|
||||||
if (_leftMouseDown && button == MouseButton.Left)
|
if (_leftMouseDown && button == MouseButton.Left)
|
||||||
{
|
{
|
||||||
WasBoxSelecting = IsBoxSelecting;
|
|
||||||
WasMovingSelection = _isMovingSelection;
|
|
||||||
|
|
||||||
_leftMouseDown = false;
|
_leftMouseDown = false;
|
||||||
EndMouseCapture();
|
EndMouseCapture();
|
||||||
Cursor = CursorType.Default;
|
Cursor = CursorType.Default;
|
||||||
|
|||||||
Reference in New Issue
Block a user