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

Merge branch 'wrap-on-underscore' of https://github.com/Tryibion/FlaxEngine into Tryibion-wrap-on-underscore

Browse Source
This commit is contained in:
Wojtek Figat
2024-07-02 09:10:37 +02:00
parent abe938c30a 8509761d67
commit ddfaeddb5f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -140,6 +140,7 @@ void Font::ProcessText(const StringView& text, Array<FontLineCache>& outputLines
int32 lastWrapCharIndex = INVALID_INDEX; int32 lastWrapCharIndex = INVALID_INDEX;
float lastWrapCharX = 0; float lastWrapCharX = 0;
bool lastMoveLine = false; bool lastMoveLine = false;
const Char compChar = TEXT('_');
// Process each character to split text into single lines // Process each character to split text into single lines
for (int32 currentIndex = 0; currentIndex < textLength;) for (int32 currentIndex = 0; currentIndex < textLength;)
@@ -153,7 +154,7 @@ void Font::ProcessText(const StringView& text, Array<FontLineCache>& outputLines
const bool isWhitespace = StringUtils::IsWhitespace(currentChar); const bool isWhitespace = StringUtils::IsWhitespace(currentChar);
// Check if character can wrap words // Check if character can wrap words
const bool isWrapChar = !StringUtils::IsAlnum(currentChar) || isWhitespace || StringUtils::IsUpper(currentChar); const bool isWrapChar = (!StringUtils::IsAlnum(currentChar) && StringUtils::Compare(&currentChar, &compChar) == 0) || isWhitespace || StringUtils::IsUpper(currentChar);
if (isWrapChar && currentIndex != 0) if (isWrapChar && currentIndex != 0)
{ {
lastWrapCharIndex = currentIndex; lastWrapCharIndex = currentIndex;