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

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

Browse Source 
# Conflicts:
#	Source/Engine/Physics/Colliders/Collider.h
This commit is contained in:
Wojtek Figat
2025-10-11 00:16:10 +02:00
parent 2bf62cc54f ef2c551cee
commit d426c5b0d9
17 changed files with 105 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Engine/Render2D/Font.cpp
View File

@@ -388,7 +388,10 @@ int32 Font::HitTestText(const StringView& text, const Float2& location, const Te
if (dst < smallestDst)
{
// Pointer is behind the last character in the line
smallestIndex = line.LastCharIndex + 1;
if (text[line.LastCharIndex] == '\n' && lineIndex != lines.Count() - 1)
smallestIndex = line.LastCharIndex;
else
smallestIndex = line.LastCharIndex + 1;
// Fix for last line
//if (lineIndex == lines.Count() - 1)