feat: add setting to disable animated badges

Chatterino2 disables them always, but we want to give the user a choice.
SevenTV · Oct 24, 2024 · 3bbcc9f · 3bbcc9f
1 parent fed59e8
commit 3bbcc9f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/src/providers/seventv/SeventvBadges.cpp b/src/providers/seventv/SeventvBadges.cpp
@@ -3,6 +3,7 @@
 #include "messages/Emote.hpp"
 #include "messages/Image.hpp"
 #include "providers/seventv/SeventvEmotes.hpp"
+#include "singletons/Settings.hpp"
 
 #include <QJsonArray>
 #include <QUrl>
@@ -59,7 +60,8 @@ void SeventvBadges::registerBadge(const QJsonObject &badgeJson)
 
     auto emote = Emote{
         .name = EmoteName{},
-        .images = SeventvEmotes::createImageSet(badgeJson, true),
+        .images = SeventvEmotes::createImageSet(
+            badgeJson, !getSettings()->animateSevenTVBadges),
         .tooltip = Tooltip{badgeJson["tooltip"].toString()},
         .homePage = Url{},
         .id = EmoteId{badgeID},

diff --git a/src/providers/seventv/SeventvEmotes.cpp b/src/providers/seventv/SeventvEmotes.cpp
@@ -142,7 +142,7 @@ CreateEmoteResult createEmote(const QJsonObject &activeEmote,
             ? createAliasedTooltip(emoteName.string, baseEmoteName.string,
                                    author.string, kind)
             : createTooltip(emoteName.string, author.string, kind);
-    auto imageSet = SeventvEmotes::createImageSet(emoteData);
+    auto imageSet = SeventvEmotes::createImageSet(emoteData, false);
 
     auto emote = Emote({
         emoteName,

diff --git a/src/singletons/Settings.hpp b/src/singletons/Settings.hpp
@@ -213,6 +213,8 @@ class Settings
     BoolSetting useCustomFfzVipBadges = {
         "/appearance/badges/useCustomFfzVipBadges", true};
     BoolSetting showBadgesSevenTV = {"/appearance/badges/seventv", true};
+    BoolSetting animateSevenTVBadges = {"/appearance/badges/animateSeventv",
+                                        true};
     QSizeSetting lastPopupSize = {
         "/appearance/lastPopup/size",
         {300, 500},

diff --git a/src/widgets/settingspages/GeneralPage.cpp b/src/widgets/settingspages/GeneralPage.cpp
@@ -974,6 +974,7 @@ void GeneralPage::initLayout(GeneralPageView &layout)
                        s.useCustomFfzModeratorBadges);
     layout.addCheckbox("Use custom FrankerFaceZ VIP badges",
                        s.useCustomFfzVipBadges);
+    layout.addCheckbox("Animate 7TV badges", s.animateSevenTVBadges);
 
     layout.addSubtitle("Overlay");
     layout.addIntInput(