mirror of
https://github.com/Chatterino/chatterino2.git
synced 2024-11-13 19:49:51 +01:00
fix: animate emotes when overlay is open (#5659)
This commit is contained in:
parent
85d34c8ff0
commit
d0b9fd0dc3
|
@ -5,7 +5,7 @@
|
|||
- Major: Add option to show pronouns in user card. (#5442, #5583)
|
||||
- Major: Release plugins alpha. (#5288)
|
||||
- Major: Improve high-DPI support on Windows. (#4868, #5391)
|
||||
- Major: Added transparent overlay window (default keybind: <kbd>CTRL</kbd> + <kbd>ALT</kbd> + <kbd>N</kbd>). (#4746, #5643)
|
||||
- Major: Added transparent overlay window (default keybind: <kbd>CTRL</kbd> + <kbd>ALT</kbd> + <kbd>N</kbd>). (#4746, #5643, #5659)
|
||||
- Minor: Removed the Ctrl+Shift+L hotkey for toggling the "live only" tab visibility state. (#5530)
|
||||
- Minor: Add support for Shared Chat messages. Shared chat messages can be filtered with the `flags.shared` filter variable, or with search using `is:shared`. Some messages like subscriptions are filtered on purpose to avoid confusion for the broadcaster. If you have both channels participating in Shared Chat open, only one of the message triggering your highlight will trigger. (#5606, #5625)
|
||||
- Minor: Moved tab visibility control to a submenu, without any toggle actions. (#5530)
|
||||
|
|
|
@ -26,6 +26,7 @@ void GIFTimer::initialize()
|
|||
|
||||
QObject::connect(&this->timer, &QTimer::timeout, [this] {
|
||||
if (getSettings()->animationsWhenFocused &&
|
||||
this->openOverlayWindows_ == 0 &&
|
||||
QApplication::activeWindow() == nullptr)
|
||||
{
|
||||
return;
|
||||
|
|
|
@ -18,9 +18,21 @@ public:
|
|||
return this->position_;
|
||||
}
|
||||
|
||||
void registerOpenOverlayWindow()
|
||||
{
|
||||
this->openOverlayWindows_++;
|
||||
}
|
||||
|
||||
void unregisterOpenOverlayWindow()
|
||||
{
|
||||
assert(this->openOverlayWindows_ >= 1);
|
||||
this->openOverlayWindows_--;
|
||||
}
|
||||
|
||||
private:
|
||||
QTimer timer;
|
||||
long unsigned position_{};
|
||||
size_t openOverlayWindows_ = 0;
|
||||
};
|
||||
|
||||
} // namespace chatterino
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
#include "common/FlagsEnum.hpp"
|
||||
#include "common/Literals.hpp"
|
||||
#include "controllers/hotkeys/HotkeyController.hpp"
|
||||
#include "singletons/Emotes.hpp"
|
||||
#include "singletons/Settings.hpp"
|
||||
#include "singletons/WindowManager.hpp"
|
||||
#include "widgets/BaseWidget.hpp"
|
||||
|
@ -166,6 +167,7 @@ OverlayWindow::OverlayWindow(IndirectChannel channel,
|
|||
|
||||
this->addShortcuts();
|
||||
this->triggerFirstActivation();
|
||||
getApp()->getEmotes()->getGIFTimer().registerOpenOverlayWindow();
|
||||
}
|
||||
|
||||
OverlayWindow::~OverlayWindow()
|
||||
|
@ -173,6 +175,7 @@ OverlayWindow::~OverlayWindow()
|
|||
#ifdef Q_OS_WIN
|
||||
::DestroyCursor(this->sizeAllCursor_);
|
||||
#endif
|
||||
getApp()->getEmotes()->getGIFTimer().unregisterOpenOverlayWindow();
|
||||
}
|
||||
|
||||
void OverlayWindow::applyTheme()
|
||||
|
|
Loading…
Reference in a new issue