noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add proper IRC text/word wrapping (#1802)

Browse source 
Fixes #1781
This commit is contained in:
pajlada 2020-07-11 09:12:17 -04:00 committed by GitHub
parent c80cdc25b3
commit 515657be19
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 45 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/messages/MessageElement.cpp
View file

@ -596,6 +596,7 @@ void IrcTextElement::addToContainer(MessageLayoutContainer &container,
// we done goofed, we need to wrap the text // we done goofed, we need to wrap the text
QString text = word.text; QString text = word.text;
std::vector<Segment> segments = word.segments;
int textLength = text.length(); int textLength = text.length();
int wordStart = 0; int wordStart = 0;
int width = 0; int width = 0;
@ -611,10 +612,47 @@ void IrcTextElement::addToContainer(MessageLayoutContainer &container,
auto charWidth = isSurrogate ? metrics.width(text.mid(i, 2)) auto charWidth = isSurrogate ? metrics.width(text.mid(i, 2))
: metrics.width(text[i]); : metrics.width(text[i]);
if (!container.fitsInLine(width + charWidth)) // if (!container.fitsInLine(width + charWidth))
{ {
container.addElementNoLineBreak(getTextLayoutElement( std::vector<Segment> pieceSegments;
text.mid(wordStart, i - wordStart), {}, width, false)); int charactersLeft = i - wordStart;
assert(charactersLeft > 0);
for (auto segmentIt = segments.begin();
segmentIt != segments.end();)
{
assert(charactersLeft > 0);
auto &segment = *segmentIt;
if (charactersLeft >= segment.text.length())
{
// Entire segment fits in this piece
pieceSegments.push_back(segment);
charactersLeft -= segment.text.length();
segmentIt = segments.erase(segmentIt);
assert(charactersLeft >= 0);
if (charactersLeft == 0)
{
break;
}
}
else
{
// Only part of the segment fits in this piece
// We create a new segment with the characters that fit, and modify the segment we checked to only contain the characters we didn't consume
Segment segmentThatFitsInPiece{
segment.text.left(charactersLeft), segment.fg,
segment.bg};
pieceSegments.emplace_back(segmentThatFitsInPiece);
segment.text = segment.text.mid(charactersLeft);
break;
}
}
container.addElementNoLineBreak(
getTextLayoutElement(text.mid(wordStart, i - wordStart),
pieceSegments, width, false));
container.breakLine(); container.breakLine();
wordStart = i; wordStart = i;
@ -631,8 +669,10 @@ void IrcTextElement::addToContainer(MessageLayoutContainer &container,
i++; i++;
} }
container.addElement(getTextLayoutElement( // Add last remaining text & segments
text.mid(wordStart), {}, width, this->hasTrailingSpace())); container.addElement(
getTextLayoutElement(text.mid(wordStart), segments, width,
this->hasTrailingSpace()));
container.breakLine(); container.breakLine();
} }
} }