noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed issues with surrogate pairs in text selection and rendering

Browse source
This commit is contained in:
fourtf 2018-10-21 13:03:26 +02:00
parent 1fde45f59b
commit f4cf464ddb
2 changed files with 29 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/messages/MessageElement.cpp
View file

@ -159,7 +159,7 @@ void TextElement::addToContainer(MessageLayoutContainer &container,
for (Word &word : this->words_) {
auto getTextLayoutElement = [&](QString text, int width,
bool trailingSpace) {
QColor color = this->color_.getColor(*app->themes);
auto color = this->color_.getColor(*app->themes);
app->themes->normalizeColor(color);
auto e = (new TextLayoutElement(
@ -205,26 +205,34 @@ void TextElement::addToContainer(MessageLayoutContainer &container,
QString text = word.text;
int textLength = text.length();
int wordStart = 0;
int width = metrics.width(text[0]);
int width = 0;
for (int i = 1; i < textLength; i++) {
int charWidth = metrics.width(text[i]);
// QChar::isHighSurrogate(text[0].unicode()) ? 2 : 1
if (!container.fitsInLine(width + charWidth)) {
for (int i = 0; i < textLength; i++) //
{
auto isSurrogate = text.size() > i + 1 &&
QChar::isHighSurrogate(text[i].unicode());
auto charWidth = isSurrogate ? metrics.width(text.mid(i, 2))
: metrics.width(text[i]);
if (!container.fitsInLine(width + charWidth)) //
{
container.addElementNoLineBreak(getTextLayoutElement(
text.mid(wordStart, i - wordStart), width, false));
container.breakLine();
wordStart = i;
width = 0;
if (textLength > i + 2) {
width += metrics.width(text[i]);
width += metrics.width(text[i + 1]);
i += 1;
}
width = charWidth;
if (isSurrogate) i++;
continue;
}
width += charWidth;
if (isSurrogate) i++;
}
container.addElement(getTextLayoutElement(

13
src/messages/layouts/MessageLayoutElement.cpp
View file

@ -214,13 +214,20 @@ int TextLayoutElement::getMouseOverIndex(const QPoint &abs) const
int x = this->getRect().left();
for (int i = 0; i < this->getText().size(); i++) {
int w = metrics.width(this->getText()[i]);
auto &text = this->getText();
auto width = metrics.width(this->getText()[i]);
if (x + width > abs.x()) {
if (text.size() > i + 1 &&
QChar::isLowSurrogate(text[i].unicode())) //
{
i++;
}
if (x + w > abs.x()) {
return i;
}
x += w;
x += width;
}
return this->getSelectionIndexCount();