Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

UI: Cleanup ellipsis more.

Browse source 
Arg, silly me.
This commit is contained in:
Unknown W. Brackets 2021-09-25 11:46:00 -07:00
parent bbc83bcdab
commit 2f570481b7
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Common/Data/Text/WrapText.cpp
View file

@ -98,6 +98,9 @@ bool WordWrapper::WrapBeforeWord() {
if (x_ + wordWidth_ > maxW_ && !hasEllipsis) {
AddEllipsis();
skipNextWord_ = true;
if ((flags_ & FLAG_WRAP_TEXT) == 0) {
scanForNewline_ = true;
}
}
}
return false;
@ -250,6 +253,9 @@ void WordWrapper::Wrap() {
AppendWord(lastEllipsisIndex_, -1, false);
AddEllipsis();
skipNextWord_ = true;
if ((flags_ & FLAG_WRAP_TEXT) == 0) {
scanForNewline_ = true;
}
continue;
}
@ -281,6 +287,9 @@ void WordWrapper::Wrap() {
AddEllipsis();
forceEarlyWrap_ = false;
skipNextWord_ = true;
if ((flags_ & FLAG_WRAP_TEXT) == 0) {
scanForNewline_ = true;
}
continue;
}
}

6
unittest/UnitTest.cpp
View file

@ -712,6 +712,12 @@ static bool TestWrapText() {
EXPECT_WORDWRAP_EQ_STR("Hello goodbye", 14, FLAG_ELLIPSIZE_TEXT, "Hello...");
EXPECT_WORDWRAP_EQ_STR("Hello goodbye", 14, FLAG_WRAP_TEXT | FLAG_ELLIPSIZE_TEXT, "Hello \ngoodbye");
// Multiple words with something short after...
EXPECT_WORDWRAP_EQ_STR("Hello goodbye yes", 14, 0, "Hello goodbye ");
EXPECT_WORDWRAP_EQ_STR("Hello goodbye yes", 14, FLAG_WRAP_TEXT, "Hello \ngoodbye \nyes");
EXPECT_WORDWRAP_EQ_STR("Hello goodbye yes", 14, FLAG_ELLIPSIZE_TEXT, "Hello...");
EXPECT_WORDWRAP_EQ_STR("Hello goodbye yes", 14, FLAG_WRAP_TEXT | FLAG_ELLIPSIZE_TEXT, "Hello \ngoodbye \nyes");
// Now, multiple words, but only the first fits.
EXPECT_WORDWRAP_EQ_STR("Hello goodbye", 10, 0, "Hello ");
EXPECT_WORDWRAP_EQ_STR("Hello goodbye", 10, FLAG_WRAP_TEXT, "Hello \ngoodb\nye");