Paintable: caching the rendered SVG.

mixxxdj · Sep 21, 2024 · c1f076b · c1f076b
1 parent 5458b4b
commit c1f076b
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 27 deletions.
diff --git a/src/widget/paintable.cpp b/src/widget/paintable.cpp
@@ -54,6 +54,7 @@ Paintable::Paintable(const PixmapSource& source, DrawMode mode, double scaleFact
     if (!source.isSVG()) {
         m_pPixmap.reset(WPixmapStore::getPixmapNoCache(source.getPath(), scaleFactor));
     } else {
+        qDebug() << "Paintable()" << source.getPath();
         auto pSvg = std::make_unique<QSvgRenderer>();
         if (!source.getSvgSourceData().isEmpty()) {
             // Call here the different overload for svg content
@@ -100,39 +101,43 @@ bool Paintable::isNull() const {
 }
 
 QSize Paintable::size() const {
+    if (m_pSvg) {
+        return m_pSvg->defaultSize();
+    }
     if (m_pPixmap) {
         return m_pPixmap->size();
-    } else if (m_pSvg) {
-        return m_pSvg->defaultSize();
     }
     return QSize();
 }
 
 int Paintable::width() const {
-    if (m_pPixmap) {
-        return m_pPixmap->width();
-    } else if (m_pSvg) {
+    if (m_pSvg) {
         QSize size = m_pSvg->defaultSize();
         return size.width();
     }
+    if (m_pPixmap) {
+        return m_pPixmap->width();
+    }
     return 0;
 }
 
 int Paintable::height() const {
-    if (m_pPixmap) {
-        return m_pPixmap->height();
-    } else if (m_pSvg) {
+    if (m_pSvg) {
         QSize size = m_pSvg->defaultSize();
         return size.height();
     }
+    if (m_pPixmap) {
+        return m_pPixmap->height();
+    }
     return 0;
 }
 
 QRectF Paintable::rect() const {
+    if (m_pSvg) {
+        return QRectF(QPointF(0, 0), m_pSvg->defaultSize());
+    }
     if (m_pPixmap) {
         return m_pPixmap->rect();
-    } else if (m_pSvg) {
-        return QRectF(QPointF(0, 0), m_pSvg->defaultSize());
     }
     return QRectF();
 }
@@ -245,8 +250,29 @@ void Paintable::drawCentered(const QRectF& targetRect, QPainter* pPainter,
 
 void Paintable::drawInternal(const QRectF& targetRect, QPainter* pPainter,
                              const QRectF& sourceRect) {
-    // qDebug() << "Paintable::drawInternal" << DrawModeToString(m_drawMode)
-    //          << targetRect << sourceRect;
+    qDebug() << "Paintable::drawInternal" << DrawModeToString(m_drawMode)
+             << targetRect << sourceRect;
+    if (m_pSvg) {
+        if (m_drawMode == TILE) {
+            qWarning() << "Tiled SVG should have been rendered to pixmap!";
+        } else {
+            if (!m_pPixmap ||
+                    m_pPixmap->size() != targetRect.size().toSize() ||
+                    m_lastSourceRect != sourceRect) {
+                qDebug() << "Paintable cache miss";
+                qreal devicePixelRatio = pPainter->device()->devicePixelRatio();
+                m_pPixmap = std::make_unique<QPixmap>(targetRect.size().toSize());
+                m_pPixmap->setDevicePixelRatio(devicePixelRatio);
+                m_pPixmap->fill(Qt::transparent);
+                auto pixmapPainter = QPainter(m_pPixmap.get());
+                m_pSvg->setViewBox(sourceRect);
+                m_pSvg->render(&pixmapPainter);
+                m_lastSourceRect = sourceRect;
+            }
+            pPainter->drawPixmap(targetRect.topLeft(), *m_pPixmap);
+        }
+        return;
+    }
     if (m_pPixmap) {
         // Note: Qt rounds the target rect to device pixels internally
         // using  roundInDeviceCoordinates()
@@ -263,21 +289,7 @@ void Paintable::drawInternal(const QRectF& targetRect, QPainter* pPainter,
                 pPainter->drawPixmap(targetRect, *m_pPixmap, sourceRect);
             }
         }
-    } else if (m_pSvg) {
-        if (m_drawMode == TILE) {
-            qWarning() << "Tiled SVG should have been rendered to pixmap!";
-        } else {
-            // NOTE(rryan): QSvgRenderer render does not clip for us -- it
-            // applies a world transformation using viewBox and renders the
-            // entire SVG to the painter. We save/restore the QPainter in case
-            // there is an existing clip region (I don't know of any Mixxx code
-            // that uses one but we may in the future).
-            PainterScope PainterScope(pPainter);
-            pPainter->setClipping(true);
-            pPainter->setClipRect(targetRect);
-            m_pSvg->setViewBox(sourceRect);
-            m_pSvg->render(pPainter, targetRect);
-        }
+        return;
     }
 }
 

diff --git a/src/widget/paintable.h b/src/widget/paintable.h
@@ -57,4 +57,5 @@ class Paintable {
     std::unique_ptr<QPixmap> m_pPixmap;
     std::unique_ptr<QSvgRenderer> m_pSvg;
     DrawMode m_drawMode;
+    QRectF m_lastSourceRect;
 };