Merge remote-tracking branch 'origin/master' into dotnet7

This commit is contained in:
Wojtek Figat
2023-02-06 10:02:13 +01:00
158 changed files with 1077 additions and 905 deletions

View File

@@ -1128,6 +1128,24 @@ namespace FlaxEngine.GUI
base.OnSubmit();
}
/// <inheritdoc />
public override void OnMouseEnter(Float2 location)
{
if (_isEditing)
Cursor = CursorType.IBeam;
base.OnMouseEnter(location);
}
/// <inheritdoc />
public override void OnMouseLeave()
{
if (Cursor == CursorType.IBeam)
Cursor = CursorType.Default;
base.OnMouseLeave();
}
/// <inheritdoc />
public override void OnMouseMove(Float2 location)
{
@@ -1141,6 +1159,9 @@ namespace FlaxEngine.GUI
// Modify selection end
SetSelection(_selectionStart, currentIndex);
}
if (Cursor == CursorType.Default && _isEditing)
Cursor = CursorType.IBeam;
}
/// <inheritdoc />
@@ -1169,6 +1190,9 @@ namespace FlaxEngine.GUI
{
SetSelection(hitPos);
}
if (Cursor == CursorType.Default)
Cursor = CursorType.IBeam;
return true;
}