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

Fixes #161

Browse source
This commit is contained in:
fourtf 2018-08-15 23:48:16 +02:00
parent af7b742a23
commit 5068c9a64e
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/singletons/Settings.hpp
View file

@ -25,6 +25,8 @@ public:
/// Appearance /// Appearance
BoolSetting showTimestamps = {"/appearance/messages/showTimestamps", true}; BoolSetting showTimestamps = {"/appearance/messages/showTimestamps", true};
BoolSetting enableAnimationsWhenFocused = {
"/appearance/enableAnimationsWhenFocused", false};
QStringSetting timestampFormat = {"/appearance/messages/timestampFormat", QStringSetting timestampFormat = {"/appearance/messages/timestampFormat",
"h:mm"}; "h:mm"};
BoolSetting showBadges = {"/appearance/messages/showBadges", true}; BoolSetting showBadges = {"/appearance/messages/showBadges", true};

13
src/singletons/helper/GifTimer.cpp
View file

@ -11,18 +11,19 @@ void GIFTimer::initialize()
this->timer.setInterval(30); this->timer.setInterval(30);
getSettings()->enableGifAnimations.connect([this](bool enabled, auto) { getSettings()->enableGifAnimations.connect([this](bool enabled, auto) {
if (enabled) { if (enabled)
this->timer.start(); this->timer.start();
} else { else
this->timer.stop(); this->timer.stop();
}
}); });
QObject::connect(&this->timer, &QTimer::timeout, [this] { QObject::connect(&this->timer, &QTimer::timeout, [this] {
if (getSettings()->enableAnimationsWhenFocused &&
qApp->activeWindow() == nullptr)
return;
this->signal.invoke(); this->signal.invoke();
// fourtf: getApp()->windows->repaintGifEmotes();
auto app = getApp();
app->windows->repaintGifEmotes();
}); });
} }

3
src/widgets/settingspages/LookPage.cpp
View file

@ -218,6 +218,9 @@ void LookPage::addEmoteTab(LayoutCreator<QVBoxLayout> layout)
*/ */
layout.append( layout.append(
this->createCheckBox("Animations", getSettings()->enableGifAnimations)); this->createCheckBox("Animations", getSettings()->enableGifAnimations));
layout.append(
this->createCheckBox("Animations only when chatterino has focus",
getSettings()->enableAnimationsWhenFocused));
auto scaleBox = layout.emplace<QHBoxLayout>().withoutMargin(); auto scaleBox = layout.emplace<QHBoxLayout>().withoutMargin();
{ {