Fix desktop hover and emoji playback; share Android chat background
This commit is contained in:
1 parent
35648a19ce
commit
1e9264735b
13 files changed
+338
-51
No files matched your search
@@ -5,7 +5,6 @@
|
||||
AnimTimer::AnimTimer() {
|
||||
m_timer.setInterval(33);
|
||||
connect(&m_timer, &QTimer::timeout, this, &AnimTimer::onTimer);
|
||||
m_timer.start();
|
||||
}
|
||||
|
||||
AnimTimer *AnimTimer::instance() {
|
||||
@@ -15,6 +14,7 @@ AnimTimer *AnimTimer::instance() {
|
||||
|
||||
void AnimTimer::shutdown() {
|
||||
instance()->m_timer.stop();
|
||||
instance()->m_playback.invalidate();
|
||||
instance()->m_icons.clear();
|
||||
DEBUG_DEBUG(DEBUG_CATEGORY_GENERAL, "AnimTimer: shutdown");
|
||||
}
|
||||
@@ -31,22 +31,29 @@ LottieIcon *AnimTimer::icon(const QString &key) const {
|
||||
return m_icons.value(key, nullptr);
|
||||
}
|
||||
|
||||
void AnimTimer::activate() {
|
||||
if (m_activeRef++ == 0) {
|
||||
for (auto *icon : m_icons)
|
||||
icon->advanceFrame();
|
||||
emit ticked();
|
||||
void AnimTimer::play() {
|
||||
if (m_icons.isEmpty()) {
|
||||
GUI_WARN("AnimTimer: playback requested without registered icons");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
void AnimTimer::deactivate() {
|
||||
if (m_activeRef > 0) m_activeRef--;
|
||||
GUI_DEBUG("AnimTimer: hover trigger icons=%d running=%d playback_ms=%d", (int)m_icons.size(), m_timer.isActive(), PlaybackMs);
|
||||
m_playback.start();
|
||||
m_timer.start();
|
||||
}
|
||||
|
||||
void AnimTimer::onTimer() {
|
||||
if (m_activeRef <= 0) return;
|
||||
for (auto *icon : m_icons)
|
||||
icon->advanceFrame();
|
||||
const qint64 elapsed = m_playback.elapsed();
|
||||
const bool finishing = elapsed >= PlaybackMs;
|
||||
bool finished = true;
|
||||
for (auto *icon : m_icons) {
|
||||
if (!finishing || icon->currentFrame() != 0) icon->advanceFrame();
|
||||
if (icon->currentFrame() != 0) finished = false;
|
||||
}
|
||||
if (finishing && finished) {
|
||||
m_timer.stop();
|
||||
m_playback.invalidate();
|
||||
GUI_DEBUG("AnimTimer: playback finished elapsed_ms=%lld icons=%d all_frames=0", (long long)elapsed, (int)m_icons.size());
|
||||
}
|
||||
emit ticked();
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user