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

Merge branch 'text-stuff' of https://github.com/Tryibion/FlaxEngine into Tryibion-text-stuff

Browse Source
This commit is contained in:
Wojtek Figat
2024-03-24 20:24:29 +01:00
parent da9d8887b2 495de38c48
commit 1f35f9536d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Engine/UI/GUI/Common/TextBoxBase.cs
View File

@@ -1265,7 +1265,7 @@ namespace FlaxEngine.GUI
// Multiline scroll // Multiline scroll
if (IsMultiline && _text.Length != 0 && IsMultilineScrollable) if (IsMultiline && _text.Length != 0 && IsMultilineScrollable)
{ {
TargetViewOffset = Float2.Clamp(_targetViewOffset - new Float2(0, delta * 10.0f), Float2.Zero, new Float2(_targetViewOffset.X, _textSize.Y)); TargetViewOffset = Float2.Clamp(_targetViewOffset - new Float2(0, delta * 10.0f), Float2.Zero, new Float2(_targetViewOffset.X, _textSize.Y - Height));
return true; return true;
} }
@@ -1456,6 +1456,7 @@ namespace FlaxEngine.GUI
{ {
// Insert new line // Insert new line
Insert('\n'); Insert('\n');
ScrollToCaret();
} }
else if (!IsNavFocused) else if (!IsNavFocused)
{ {