chatterino2
Code Issues

Emote popup channelname (#475)

Browse Source 
Fix #464
This commit is contained in:
pajlada
2018-06-24 14:42:40 +02:00
committed by GitHub
parent ebe0f0c87f
commit eae2c2c521
4 changed files with 163 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/emotepopup.cpp
+13 -2
View File
@@ -92,7 +92,18 @@ void EmotePopup::loadChannel(ChannelPtr _channel)
// TITLE
messages::MessageBuilder builder1;
builder1.append(new TextElement("Twitch Account Emotes", MessageElement::Text));
QString setText;
if (set->text.isEmpty()) {
if (set->channelName.isEmpty()) {
setText = "Twitch Account Emotes";
} else {
setText = "Twitch Account Emotes (" + set->channelName + ")";
}
} else {
setText = set->text;
}
builder1.append(new TextElement(setText, MessageElement::Text));
builder1.getMessage()->flags |= Message::Centered;
emoteChannel->addMessage(builder1.getMessage());
@@ -102,7 +113,7 @@ void EmotePopup::loadChannel(ChannelPtr _channel)
builder2.getMessage()->flags |= Message::Centered;
builder2.getMessage()->flags |= Message::DisableCompactEmotes;
for (const auto &emote : set.emotes) {
for (const auto &emote : set->emotes) {
[&](const QString &key, const util::EmoteData &value) {
builder2.append((new EmoteElement(value, MessageElement::Flags::AlwaysShow))
->setLink(Link(Link::InsertText, key)));