YourWishes/Dawn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed lines ending with whitespace.

Browse Source
This commit is contained in:
Dominic Masters
2023-03-14 21:21:16 -07:00
parent 9c556c4955
commit 374ae30b88
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/dawn/display/font/BitmapFont.cpp
View File

@ -79,10 +79,13 @@ void BitmapFont::buffer(
if(maxWidth != -1 && (xy0.x+tileSize.x) > maxWidth) { if(maxWidth != -1 && (xy0.x+tileSize.x) > maxWidth) {
// We've exceeded the edge on THIS character. We first need to go back to // We've exceeded the edge on THIS character. We first need to go back to
// the start of the word and push it to the new line // the start of the word and push it to the new line
size_t charsToBeRewound = ((i - 1) - wordStart); size_t charsToBeRewound = ((i - 1) - wordStart);
info->width = mathMax<float_t>(info->width, xy0.x - (tileSize.x * charsToBeRewound)); info->width = mathMax<float_t>(
info->width,
(xy0.x - (tileSize.x * charsToBeRewound)) -
(wordStart > 0 && text[wordStart - 1] == FONT_SPACE ? tileSize.x : 0)
);
xy0.x = 0; xy0.x = 0;
xy0.y += tileSize.y; xy0.y += tileSize.y;
@ -99,8 +102,6 @@ void BitmapFont::buffer(
xy0.x += tileSize.x; xy0.x += tileSize.x;
j++; j++;
} }
// Next line begins with this word
} }
tile = this->tileset->getTile(c); tile = this->tileset->getTile(c);