thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert accidental animated image change

Browse source
This commit is contained in:
Nicolas Werner 2022-09-30 04:03:39 +02:00
parent 1ea5449c18
commit 78784babd1
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
2 changed files with 31 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/ui/MxcAnimatedImage.cpp
View file

@ -8,7 +8,6 @@
#include <QDir>
#include <QFileInfo>
#include <QMimeDatabase>
#include <QMovie>
#include <QQuickWindow>
#include <QSGImageNode>
#include <QStandardPaths>
@ -35,12 +34,8 @@ MxcAnimatedImage::startDownload()
QByteArray mimeType = QString::fromStdString(mtx::accessors::mimetype(*event)).toUtf8();
static const auto movieFormats = QMovie::supportedFormats();
QByteArray imageFormat;
const auto imageFormats = QImageReader::imageFormatsForMimeType(mimeType);
if (!imageFormats.isEmpty())
imageFormat = imageFormats.front();
animatable_ = movieFormats.contains(imageFormat);
static const auto formats = QMovie::supportedFormats();
animatable_ = formats.contains(mimeType.split('/').back());
animatableChanged();
if (!animatable_)
@ -71,14 +66,14 @@ MxcAnimatedImage::startDownload()
QPointer<MxcAnimatedImage> self = this;
auto processBuffer = [this, imageFormat, encryptionInfo, self](QIODevice &device) {
auto processBuffer = [this, mimeType, encryptionInfo, self](QIODevice &device) {
if (!self)
return;
try {
if (buffer.isOpen()) {
frameTimer.stop();
movie->setDevice(nullptr);
movie.stop();
movie.setDevice(nullptr);
buffer.close();
}
@ -97,22 +92,21 @@ MxcAnimatedImage::startDownload()
nhlog::net()->error("Failed to setup animated image buffer: {}", e.what());
}
QTimer::singleShot(0, this, [this, imageFormat] {
QTimer::singleShot(0, this, [this, mimeType] {
nhlog::ui()->info(
"Playing movie with size: {}, {}", buffer.bytesAvailable(), buffer.isOpen());
movie->setFormat(imageFormat);
movie->setDevice(&buffer);
movie.setFormat(mimeType);
movie.setDevice(&buffer);
if (height() != 0 && width() != 0)
movie->setScaledSize(this->size().toSize());
if (movie->supportsAnimation())
frameTimer.setInterval(movie->nextImageDelay());
movie.setScaledSize(this->size().toSize());
if (buffer.bytesAvailable() <
4LL * 1024 * 1024 * 1024) // cache images smaller than 4MB in RAM
movie.setCacheMode(QMovie::CacheAll);
if (play_)
frameTimer.start();
movie.start();
else
movie->jumpToImage(0);
movie.jumpToFrame(0);
emit loadedChanged();
update();
});
@ -165,9 +159,9 @@ MxcAnimatedImage::geometryChanged(const QRectF &newGeometry, const QRectF &oldGe
if (newGeometry.size() != oldGeometry.size()) {
if (height() != 0 && width() != 0) {
QSizeF r = movie->scaledSize();
QSizeF r = movie.scaledSize();
r.scale(newGeometry.size(), Qt::KeepAspectRatio);
movie->setScaledSize(r.toSize());
movie.setScaledSize(r.toSize());
imageDirty = true;
update();
}
@ -190,15 +184,16 @@ MxcAnimatedImage::updatePaintNode(QSGNode *oldNode, QQuickItem::UpdatePaintNodeD
n->setFlags(QSGNode::OwnedByParent);
}
n->setSourceRect(currentFrame.rect());
if (!currentFrame.isNull())
n->setTexture(window()->createTextureFromImage(currentFrame));
auto img = movie.currentImage();
n->setSourceRect(img.rect());
if (!img.isNull())
n->setTexture(window()->createTextureFromImage(std::move(img)));
else {
delete n;
return nullptr;
}
QSizeF r = currentFrame.size();
QSizeF r = img.size();
r.scale(size(), Qt::KeepAspectRatio);
n->setRect((width() - r.width()) / 2, (height() - r.height()) / 2, r.width(), r.height());