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

fixed badges scaling with emote scale slider #817
2018-10-25 11:08:56 +02:00
parent 5497fec839 0e96caad5f
commit e3ada8ed2c
1 changed files with 4 additions and 1 deletions
@@ -121,7 +121,10 @@ void EmoteElement::addToContainer(MessageLayoutContainer &container,
            if (image->isEmpty())
                return;

-            auto emoteScale = getSettings()->emoteScale.getValue();
+            auto emoteScale =
+                this->getFlags().hasAny(MessageElementFlag::Badges)
+                    ? 1
+                    : getSettings()->emoteScale.getValue();

            auto size =
                QSize(int(container.getScale() * image->width() * emoteScale),