Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-22 14:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed a line breaking issue

Browse source
This commit is contained in:
Leon Styhre 2024-09-04 17:19:36 +02:00
parent 281b967e8f
commit c80ba5be86
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
es-core/src/resources/Font.cpp
View file

@ -882,7 +882,12 @@ void Font::wrapText(std::vector<ShapeSegment>& segmentsHB,
// New row. // New row.
size_t offset {0}; size_t offset {0};
if (lastSpace == i && !lastSegmentSpace) { bool shapedSegmentChange {false};
if (lastSpace == 0 && resultSegments.size() > 0 &&
!resultSegments.back().lineBreak)
shapedSegmentChange = true;
if (lastSpace == i && !lastSegmentSpace && !shapedSegmentChange) {
if (segment.rightToLeft) if (segment.rightToLeft)
newSegment.glyphIndexes.insert(newSegment.glyphIndexes.begin(), newSegment.glyphIndexes.insert(newSegment.glyphIndexes.begin(),
segment.glyphIndexes[i]); segment.glyphIndexes[i]);
@ -906,6 +911,9 @@ void Font::wrapText(std::vector<ShapeSegment>& segmentsHB,
spaceAccum = 0; spaceAccum = 0;
} }
} }
else if (shapedSegmentChange) {
offset = i;
}
else { else {
if (lastSpace == 0) if (lastSpace == 0)
++spaceAccum; ++spaceAccum;