fix: WebView support for GIF assets (#2389)

Author: nicomiguelino

webview/src/view.cpp

@@ -8,6 +8,8 @@
 #include <QNetworkReply>
 #include <QImage>
 #include <QPainter>
+#include <QMovie>
+#include <QBuffer>
 
 #include "view.h"
 
@@ -28,6 +30,19 @@ View::View(QWidget* parent) : QWidget(parent)
     networkManager = new QNetworkAccessManager(this);
     currentImage = QImage();
     nextImage = QImage();
+    movie = nullptr;
+    animationTimer = new QTimer(this);
+    isAnimatedImage = false;
+
+    connect(animationTimer, &QTimer::timeout, this, &View::updateMovieFrame);
+}
+
+View::~View()
+{
+    if (movie) {
+        movie->stop();
+        delete movie;
+    }
 }
 
 void View::loadPage(const QString &uri)
@@ -61,6 +76,15 @@ void View::loadImage(const QString &preUri)
 {
     qDebug() << "Type: Image";
 
+    // Stop any existing animation
+    if (movie) {
+        movie->stop();
+        delete movie;
+        movie = nullptr;
+    }
+    animationTimer->stop();
+    isAnimatedImage = false;
+
     QFileInfo fileInfo = QFileInfo(preUri);
     QString src;
 
@@ -99,19 +123,15 @@ void View::loadImage(const QString &preUri)
 
     connect(reply, &QNetworkReply::finished, this, [=]() {
         if (reply->error() == QNetworkReply::NoError) {
-            QImage newImage;
             QByteArray data = reply->readAll();
             qDebug() << "Received image data size:" << data.size();
 
-            if (newImage.loadFromData(data)) {
-                qDebug() << "Successfully loaded image. Size:" << newImage.size();
-                nextImage = newImage;
-                // Only hide web view and update current image after the new image is loaded
-                webView->setVisible(false);
-                currentImage = nextImage;
-                update();
+            if (tryLoadAsAnimatedGif(data)) {
+                // Successfully loaded as animated GIF
+                return;
             } else {
-                qDebug() << "Failed to load image from data";
+                // Load as static image
+                loadAsStaticImage(data);
             }
         } else {
             qDebug() << "Network error:" << reply->errorString();
@@ -125,13 +145,109 @@ void View::loadImage(const QString &preUri)
     });
 }
 
+bool View::tryLoadAsAnimatedGif(const QByteArray& data)
+{
+    // Try to load as QMovie first to check if it's an animated GIF
+    QBuffer* testBuffer = new QBuffer();
+    testBuffer->setData(data);
+    testBuffer->open(QIODevice::ReadOnly);
+
+    // Create QMovie to test if it's animated
+    QMovie testMovie(testBuffer, QByteArray(), this);
+
+    if (testMovie.isValid() && testMovie.frameCount() > 1) {
+        // This is an animated GIF
+        qDebug() << "Detected animated GIF with" << testMovie.frameCount() << "frames";
+        delete testBuffer; // Clean up test buffer
+
+        // Create a new buffer for the actual movie
+        QBuffer* buffer = new QBuffer();
+        buffer->setData(data);
+        buffer->open(QIODevice::ReadOnly);
+
+        // Create the actual movie for animation
+        movie = new QMovie(buffer, QByteArray(), this);
+
+        if (movie->isValid()) {
+            qDebug() << "GIF animation loaded successfully. Frame count:" << movie->frameCount();
+            qDebug() << "Animation speed:" << movie->speed() << "ms per frame";
+
+            setupAnimation();
+            return true;
+        } else {
+            qDebug() << "Failed to load GIF as animation, falling back to static image";
+            delete movie;
+            movie = nullptr;
+            delete buffer;
+
+            // Fall back to static image loading - this preserves original behavior
+            loadAsStaticImage(data);
+            return true; // Return true to prevent double loading
+        }
+    } else {
+        // This is a static image (including single-frame GIFs)
+        delete testBuffer;
+        return false;
+    }
+}
+
+void View::loadAsStaticImage(const QByteArray& data)
+{
+    QImage newImage;
+    if (newImage.loadFromData(data)) {
+        qDebug() << "Successfully loaded static image. Size:" << newImage.size();
+        nextImage = newImage;
+        webView->setVisible(false);
+        currentImage = nextImage;
+        update();
+    } else {
+        qDebug() << "Failed to load image from data";
+    }
+}
+
+void View::updateMovieFrame()
+{
+    if (movie && isAnimatedImage && movie->state() == QMovie::Running) {
+        // Try to advance to the next frame
+        if (movie->jumpToNextFrame()) {
+            QImage newFrame = movie->currentImage();
+            if (!newFrame.isNull()) {
+                currentImage = newFrame;
+                update();
+            }
+        }
+
+        // Schedule next frame update
+        scheduleNextFrame();
+    }
+}
+
+void View::scheduleNextFrame()
+{
+    int frameDelay = movie->nextFrameDelay();
+    if (frameDelay > 0) {
+        animationTimer->start(frameDelay);
+    } else {
+        // If no delay specified, try to get it from the movie speed
+        frameDelay = movie->speed();
+        if (frameDelay > 0) {
+            animationTimer->start(frameDelay);
+        } else {
+            animationTimer->start(100); // Default delay
+        }
+    }
+}
+
 void View::paintEvent(QPaintEvent*)
 {
     QPainter painter(this);
     painter.fillRect(rect(), Qt::black);
 
     if (!currentImage.isNull()) {
-        qDebug() << "Painting image. Size:" << currentImage.size();
+        // Only log for static images to avoid spam during animation
+        if (!isAnimatedImage) {
+            qDebug() << "Painting image. Size:" << currentImage.size();
+        }
         QSize scaledSize = currentImage.size();
         scaledSize.scale(size(), Qt::KeepAspectRatio);
         QRect targetRect = QRect(QPoint(0, 0), size());
@@ -157,3 +273,25 @@ void View::handleAuthRequest(QNetworkReply* reply, QAuthenticator* auth)
     Q_UNUSED(auth)
     webView->load(QUrl::fromLocalFile(QStandardPaths::locate(QStandardPaths::AppDataLocation, "res/access_denied.html")));
 }
+
+void View::setupAnimation()
+{
+    isAnimatedImage = true;
+    webView->setVisible(false);
+
+    // Start the animation
+    movie->start();
+
+    // Set up timer for frame updates
+    int frameDelay = movie->nextFrameDelay();
+    if (frameDelay > 0) {
+        animationTimer->start(frameDelay);
+    } else {
+        // Default to 100ms if no delay specified
+        animationTimer->start(100);
+    }
+
+    // Get the first frame
+    currentImage = movie->currentImage();
+    update();
+}

webview/src/view.h

@@ -7,13 +7,16 @@
 #include <QNetworkReply>
 #include <QNetworkAccessManager>
 #include <QImage>
+#include <QMovie>
+#include <QTimer>
 
 class View : public QWidget
 {
     Q_OBJECT
 
 public:
     explicit View(QWidget* parent);
+    ~View();
     QWebEngineView* webView;  // Made public for MainWindow access
 
     void loadPage(const QString &uri);
@@ -25,11 +28,20 @@ class View : public QWidget
 
 private slots:
     void handleAuthRequest(QNetworkReply*, QAuthenticator*);
+    void updateMovieFrame();
 
 private:
+    bool tryLoadAsAnimatedGif(const QByteArray& data);
+    void loadAsStaticImage(const QByteArray& data);
+    void scheduleNextFrame();
+    void setupAnimation();
+
     QWebEnginePage* pre_loader;
     QEventLoop pre_loader_loop;
     QNetworkAccessManager* networkManager;
     QImage currentImage;
     QImage nextImage;
+    QMovie* movie;
+    QTimer* animationTimer;
+    bool isAnimatedImage;
 };