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

Merge pull request #808 from fourtf/pajlada-fix-emote-scale

Browse source 
Fix emote scale
This commit is contained in:
pajlada 2018-10-21 11:03:37 +02:00 committed by GitHub
parent 4f4d717a52 0abe85f53c
commit 888c594929
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/messages/ImageSet.cpp
View file

@ -58,6 +58,8 @@ const ImagePtr &ImageSet::getImage3() const
const ImagePtr &ImageSet::getImage(float scale) const const ImagePtr &ImageSet::getImage(float scale) const
{ {
scale *= getSettings()->emoteScale;
int quality = 1; int quality = 1;
if (scale > 2.999) if (scale > 2.999)

7
src/messages/MessageElement.cpp
View file

@ -117,8 +117,11 @@ void EmoteElement::addToContainer(MessageLayoutContainer &container,
auto image = this->emote_->images.getImage(container.getScale()); auto image = this->emote_->images.getImage(container.getScale());
if (image->isEmpty()) return; if (image->isEmpty()) return;
auto size = QSize(int(container.getScale() * image->width()), auto emoteScale = getSettings()->emoteScale.getValue();
int(container.getScale() * image->height()));
auto size =
QSize(int(container.getScale() * image->width() * emoteScale),
int(container.getScale() * image->height() * emoteScale));
container.addElement((new ImageLayoutElement(*this, image, size)) container.addElement((new ImageLayoutElement(*this, image, size))
->setLink(this->getLink())); ->setLink(this->getLink()));