Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-09 07:42:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

UI: Cleanup double ellipsis issues.

Browse Source 
We mostly only use FLAG_ELLIPSIZE_TEXT in PPGe, but it wasn't behaving
well in some cases.
This commit is contained in:
Unknown W. Brackets 2021-09-25 09:41:11 -07:00
parent a83003b228
commit 92d13cc05b
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Common/Data/Text/WrapText.cpp
View File

@ -91,14 +91,16 @@ bool WordWrapper::WrapBeforeWord() {
}
}
if (flags_ & FLAG_ELLIPSIZE_TEXT) {
if (x_ + wordWidth_ > maxW_) {
const bool hasEllipsis = out_.size() > 3 && out_.substr(out_.size() - 3) == "...";
if (x_ + wordWidth_ > maxW_ && !hasEllipsis) {
if (!out_.empty() && IsSpace(out_[out_.size() - 1])) {
out_[out_.size() - 1] = '.';
out_ += "..";
} else {
out_ += "...";
}
x_ = maxW_;
x_ += ellipsisWidth_;
skipNextWord_ = true;
}
}
return false;
@ -119,7 +121,7 @@ void WordWrapper::AppendWord(int endIndex, bool addNewline) {
}
// This will include the newline.
if (x_ <= maxW_) {
if (x_ <= maxW_ && !skipNextWord_) {
out_.append(str_ + lastWordStartIndex, str_ + endIndex);
} else {
scanForNewline_ = true;
@ -222,7 +224,7 @@ void WordWrapper::Wrap() {
}
if ((flags_ & FLAG_ELLIPSIZE_TEXT) && wordWidth_ > 0.0f && x_ + newWordWidth + ellipsisWidth_ > maxW_) {
if ((flags_ & FLAG_WRAP_TEXT) == 0) {
if ((flags_ & FLAG_WRAP_TEXT) == 0 && x_ + wordWidth_ + ellipsisWidth_ <= maxW_) {
// Now, add the word so far (without this latest character) and show the ellipsis.
AppendWord(beforeIndex, true);
if (lastLineStart_ != out_.size()) {

2
Common/Data/Text/WrapText.h
View File

@ -40,4 +40,6 @@ protected:
bool forceEarlyWrap_ = false;
// Skip all characters until the next newline.
bool scanForNewline_ = false;
// Skip the next word, replaced with ellipsis.
bool skipNextWord_ = false;
};