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

Fixes some emojis that wouldn't display properly

Browse source 
Fix #198
This commit is contained in:
Rasmus Karlsson 2018-03-31 13:14:43 +02:00 committed by fourtf
parent 010c061a25
commit c382fdc528
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/singletons/emotemanager.cpp
View file

@ -295,9 +295,12 @@ void EmoteManager::loadEmojis()
this->emojis.insert(code, util::EmoteData(new Image(url, 0.35, ":" + shortCode + ":", this->emojis.insert(code, util::EmoteData(new Image(url, 0.35, ":" + shortCode + ":",
":" + shortCode + ":<br/>Emoji"))); ":" + shortCode + ":<br/>Emoji")));
}
// TODO(pajlada): The vectors in emojiFirstByte need to be sorted by for (auto &p : this->emojiFirstByte) {
// emojiData.code.length() std::stable_sort(p.begin(), p.end(), [](const auto &lhs, const auto &rhs) {
return lhs.value.length() > rhs.value.length();
});
} }
} }
@ -306,7 +309,7 @@ void EmoteManager::parseEmojis(std::vector<std::tuple<util::EmoteData, QString>>
{ {
int lastParsedEmojiEndIndex = 0; int lastParsedEmojiEndIndex = 0;
for (auto i = 0; i < text.length() - 1; i++) { for (auto i = 0; i < text.length(); ++i) {
const QChar character = text.at(i); const QChar character = text.at(i);
if (character.isLowSurrogate()) { if (character.isLowSurrogate()) {
@ -321,14 +324,15 @@ void EmoteManager::parseEmojis(std::vector<std::tuple<util::EmoteData, QString>>
const QVector<EmojiData> possibleEmojis = it.value(); const QVector<EmojiData> possibleEmojis = it.value();
int remainingCharacters = text.length() - i; int remainingCharacters = text.length() - i - 1;
EmojiData matchedEmoji; EmojiData matchedEmoji;
int matchedEmojiLength = 0; int matchedEmojiLength = 0;
for (const EmojiData &emoji : possibleEmojis) { for (const EmojiData &emoji : possibleEmojis) {
if (remainingCharacters < emoji.value.length()) { int emojiExtraCharacters = emoji.value.length() - 1;
if (emojiExtraCharacters > remainingCharacters) {
// It cannot be this emoji, there's not enough space for it // It cannot be this emoji, there's not enough space for it
continue; continue;
} }