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

fix: double ellipsis in reply (#5174)

Browse source
This commit is contained in:
nerix 2024-02-18 19:25:46 +01:00 committed by GitHub
parent 5c51ec8382
commit cd0387b064
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -50,7 +50,7 @@
- Bugfix: Fixed empty page being added when showing out of bounds dialog. (#4849) - Bugfix: Fixed empty page being added when showing out of bounds dialog. (#4849)
- Bugfix: Fixed an issue preventing searching a redemption by it's title when the redemption contained text input. (#5117) - Bugfix: Fixed an issue preventing searching a redemption by it's title when the redemption contained text input. (#5117)
- Bugfix: Fixed issue on Windows preventing the title bar from being dragged in the top left corner. (#4873) - Bugfix: Fixed issue on Windows preventing the title bar from being dragged in the top left corner. (#4873)
- Bugfix: Fixed an issue where reply context didn't render correctly if an emoji was touching text. (#4875, #4977) - Bugfix: Fixed an issue where reply context didn't render correctly if an emoji was touching text. (#4875, #4977, #5174)
- Bugfix: Fixed the input completion popup from disappearing when clicking on it on Windows and macOS. (#4876) - Bugfix: Fixed the input completion popup from disappearing when clicking on it on Windows and macOS. (#4876)
- Bugfix: Fixed double-click text selection moving its position with each new message. (#4898) - Bugfix: Fixed double-click text selection moving its position with each new message. (#4898)
- Bugfix: Fixed an issue where notifications on Windows would contain no or an old avatar. (#4899) - Bugfix: Fixed an issue where notifications on Windows would contain no or an old avatar. (#4899)

10
src/messages/MessageElement.cpp
View file

@ -608,7 +608,7 @@ void SingleLineTextElement::addToContainer(MessageLayoutContainer &container,
return e; return e;
}; };
static const auto ellipsis = QStringLiteral("..."); static const auto ellipsis = QStringLiteral("…");
// String to continuously append words onto until we place it in the container // String to continuously append words onto until we place it in the container
// once we encounter an emote or reach the end of the message text. */ // once we encounter an emote or reach the end of the message text. */
@ -628,6 +628,7 @@ void SingleLineTextElement::addToContainer(MessageLayoutContainer &container,
currentText += ' '; currentText += ' ';
} }
bool done = false;
for (const auto &parsedWord : for (const auto &parsedWord :
app->getEmotes()->getEmojis()->parse(word.text)) app->getEmotes()->getEmojis()->parse(word.text))
{ {
@ -641,6 +642,7 @@ void SingleLineTextElement::addToContainer(MessageLayoutContainer &container,
container.remainingWidth()); container.remainingWidth());
if (currentText != prev) if (currentText != prev)
{ {
done = true;
break; break;
} }
} }
@ -663,6 +665,7 @@ void SingleLineTextElement::addToContainer(MessageLayoutContainer &container,
emoteSize.width())) emoteSize.width()))
{ {
currentText += ellipsis; currentText += ellipsis;
done = true;
break; break;
} }
@ -678,6 +681,11 @@ void SingleLineTextElement::addToContainer(MessageLayoutContainer &container,
} }
} }
} }
if (done)
{
break;
}
} }
// Add the last of the pending message text to the container. // Add the last of the pending message text to the container.