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

fix copying <br>Global/Channel ffz emote after copying a ffz emote (#342)

Browse source
This commit is contained in:
hemirt 2018-04-14 15:10:25 +02:00 committed by pajlada
parent 8272b0184d
commit 597660af2f
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/singletons/emotemanager.cpp
View file

@ -54,7 +54,7 @@ QString GetFFZEmoteLink(const QJsonObject &urls, const QString &emoteScale)
return "http:" + emote.toString(); return "http:" + emote.toString();
} }
void FillInFFZEmoteData(const QJsonObject &urls, const QString &code, util::EmoteData &emoteData) void FillInFFZEmoteData(const QJsonObject &urls, const QString &code, const QString &tooltip, util::EmoteData &emoteData)
{ {
QString url1x = GetFFZEmoteLink(urls, "1"); QString url1x = GetFFZEmoteLink(urls, "1");
QString url2x = GetFFZEmoteLink(urls, "2"); QString url2x = GetFFZEmoteLink(urls, "2");
@ -62,14 +62,14 @@ void FillInFFZEmoteData(const QJsonObject &urls, const QString &code, util::Emot
assert(!url1x.isEmpty()); assert(!url1x.isEmpty());
emoteData.image1x = new Image(url1x, 1, code, code); emoteData.image1x = new Image(url1x, 1, code, tooltip);
if (!url2x.isEmpty()) { if (!url2x.isEmpty()) {
emoteData.image2x = new Image(url2x, 0.5, code, code); emoteData.image2x = new Image(url2x, 0.5, code, tooltip);
} }
if (!url3x.isEmpty()) { if (!url3x.isEmpty()) {
emoteData.image3x = new Image(url3x, 0.25, code, code); emoteData.image3x = new Image(url3x, 0.25, code, tooltip);
} }
} }
@ -189,7 +189,7 @@ void EmoteManager::reloadFFZChannelEmotes(const QString &channelName,
auto emote = auto emote =
this->getFFZChannelEmoteFromCaches().getOrAdd(id, [this, &code, &urls] { this->getFFZChannelEmoteFromCaches().getOrAdd(id, [this, &code, &urls] {
util::EmoteData emoteData; util::EmoteData emoteData;
FillInFFZEmoteData(urls, code + "<br/>Channel FFZ Emote", emoteData); FillInFFZEmoteData(urls, code, code + "<br/>Channel FFZ Emote", emoteData);
return emoteData; return emoteData;
}); });
@ -515,7 +515,7 @@ void EmoteManager::loadFFZEmotes()
QJsonObject urls = object.value("urls").toObject(); QJsonObject urls = object.value("urls").toObject();
util::EmoteData emoteData; util::EmoteData emoteData;
FillInFFZEmoteData(urls, code + "<br/>Global FFZ Emote", emoteData); FillInFFZEmoteData(urls, code, code + "<br/>Global FFZ Emote", emoteData);
this->ffzGlobalEmotes.insert(code, emoteData); this->ffzGlobalEmotes.insert(code, emoteData);
codes.push_back(code.toStdString()); codes.push_back(code.toStdString());