libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2025-01-19 07:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

UI: Wrap text properly with explicit newlines.

Browse Source 
Fixes the non-Android part of #10217.
This commit is contained in:
Unknown W. Brackets 2017-12-02 14:38:59 -08:00
parent 1f9fabee57
commit 4ad7107151
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ext/native/util/text/wrap_text.cpp
View File

@ -97,9 +97,9 @@ void WordWrapper::AppendWord(int endIndex, bool addNewline) {
lastLineStart_ = (int)out_.size();
} else {
// We may have appended a newline - check.
size_t pos = out_.find_last_of("\n", lastLineStart_);
size_t pos = out_.substr(lastLineStart_).find_last_of("\n");
if (pos != out_.npos) {
lastLineStart_ = (int)pos;
lastLineStart_ += (int)pos;
}
}
lastIndex_ = endIndex;
@ -132,13 +132,8 @@ void WordWrapper::Wrap() {
continue;
}
float newWordWidth = 0.0f;
if (c == '\n') {
newWordWidth = wordWidth_;
} else {
// Measure the entire word for kerning purposes. May not be 100% perfect.
newWordWidth = MeasureWidth(str_ + lastIndex_, afterIndex - lastIndex_);
}
// Measure the entire word for kerning purposes. May not be 100% perfect.
float newWordWidth = MeasureWidth(str_ + lastIndex_, afterIndex - lastIndex_);
// Is this the end of a word (space)?
if (wordWidth_ > 0.0f && IsSpace(c)) {