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

Merge pull request #823 from pphop/pphop-fix-badge-scaling

Browse source 
fixed badges scaling with emote scale slider #817
This commit is contained in:
pajlada 2018-10-25 11:08:56 +02:00 committed by GitHub
commit e3ada8ed2c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/messages/MessageElement.cpp
View file

@ -121,7 +121,10 @@ void EmoteElement::addToContainer(MessageLayoutContainer &container,
if (image->isEmpty()) if (image->isEmpty())
return; return;
auto emoteScale = getSettings()->emoteScale.getValue(); auto emoteScale =
this->getFlags().hasAny(MessageElementFlag::Badges)
? 1
: getSettings()->emoteScale.getValue();
auto size = auto size =
QSize(int(container.getScale() * image->width() * emoteScale), QSize(int(container.getScale() * image->width() * emoteScale),