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

hardcoded list of BTTV's christmas emotes

Browse source
This commit is contained in:
Rasmus Karlsson 2019-12-05 20:10:56 -08:00
parent bcc53c9aa7
commit 2d3fb8950e
3 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/messages/MessageElement.hpp
View file

@ -103,6 +103,10 @@ enum class MessageElementFlag {
LowercaseLink = (1 << 29),
OriginalLink = (1 << 30),
// ZeroWidthEmotes are emotes that are supposed to overlay over any pre-existing emotes
// e.g. BTTV's SoSnowy during christmas season
ZeroWidthEmote = (1 << 31),
Default = Timestamp | Badges | Username | BitsStatic | FfzEmoteImage |
BttvEmoteImage | TwitchEmoteImage | BitsAmount | Text |
AlwaysShow,

18
src/messages/layouts/MessageLayoutContainer.cpp
View file

@ -115,15 +115,27 @@ void MessageLayoutContainer::_addElement(MessageLayoutElement *element,
// update line height
this->lineHeight_ = std::max(this->lineHeight_, newLineHeight);
auto xOffset = 0;
if (element->getCreator().getFlags().has(
MessageElementFlag::ZeroWidthEmote))
{
xOffset -= element->getRect().width() + this->spaceWidth_;
}
// set move element
element->setPosition(
QPoint(this->currentX_, this->currentY_ - element->getRect().height()));
element->setPosition(QPoint(this->currentX_ + xOffset,
this->currentY_ - element->getRect().height()));
// add element
this->elements_.push_back(std::unique_ptr<MessageLayoutElement>(element));
// set current x
this->currentX_ += element->getRect().width();
if (!element->getCreator().getFlags().has(
MessageElementFlag::ZeroWidthEmote))
{
this->currentX_ += element->getRect().width();
}
if (element->hasTrailingSpace())
{

9
src/providers/twitch/TwitchMessageBuilder.cpp
View file

@ -28,6 +28,10 @@
namespace {
const QStringList zeroWidthEmotes{
"SoSnowy", "IceCold", "SantaHat", "TopHat", "ReinDeer", "CandyCane",
};
QColor getRandomColor(const QVariant &userId)
{
static const std::vector<QColor> twitchUsernameColors = {
@ -1162,6 +1166,11 @@ Outcome TwitchMessageBuilder::tryAppendEmote(const EmoteName &name)
else if ((emote = globalBttvEmotes.emote(name)))
{
flags = MessageElementFlag::BttvEmote;
if (zeroWidthEmotes.contains(name.string))
{
flags.set(MessageElementFlag::ZeroWidthEmote);
}
}
if (emote)