1 files changed, 125 insertions, 82 deletions
diff --git a/vcl/inc/qt5/Qt5Graphics.hxx b/vcl/inc/qt5/Qt5Graphics.hxx
index e90731179d53..011d3384e804 100644
--- a/vcl/inc/qt5/Qt5Graphics.hxx
+++ b/vcl/inc/qt5/Qt5Graphics.hxx
@@ -37,9 +37,8 @@ class Qt5FontFace;
 class Qt5Frame;
 class Qt5Painter;
 
-class Qt5Graphics final : public SalGraphics, public Qt5GraphicsBase
+class Qt5GraphicsBackend final : public SalGraphicsImpl, public Qt5GraphicsBase
 {
-    friend class Qt5Bitmap;
     friend class Qt5Painter;
 
     Qt5Frame* m_pFrame;
@@ -50,6 +49,124 @@ class Qt5Graphics final : public SalGraphics, public Qt5GraphicsBase
     Color m_aFillColor;
     QPainter::CompositionMode m_eCompositionMode;
 
+public:
+    Qt5GraphicsBackend(Qt5Frame* pFrame, QImage* pQImage);
+    ~Qt5GraphicsBackend() override;
+
+    void Init() override {}
+
+    QImage* getQImage() { return m_pQImage; }
+
+    void setQImage(QImage* pQImage) { m_pQImage = pQImage; }
+
+    void freeResources() override {}
+
+    OUString getRenderBackendName() const override { return "qt5"; }
+
+    bool setClipRegion(vcl::Region const& rRegion) override;
+    void ResetClipRegion() override;
+
+    sal_uInt16 GetBitCount() const override;
+
+    tools::Long GetGraphicsWidth() const override;
+
+    void SetLineColor() override;
+    void SetLineColor(Color nColor) override;
+    void SetFillColor() override;
+    void SetFillColor(Color nColor) override;
+    void SetXORMode(bool bSet, bool bInvertOnly) override;
+    void SetROPLineColor(SalROPColor nROPColor) override;
+    void SetROPFillColor(SalROPColor nROPColor) override;
+
+    void drawPixel(tools::Long nX, tools::Long nY) override;
+    void drawPixel(tools::Long nX, tools::Long nY, Color nColor) override;
+
+    void drawLine(tools::Long nX1, tools::Long nY1, tools::Long nX2, tools::Long nY2) override;
+    void drawRect(tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight) override;
+    void drawPolyLine(sal_uInt32 nPoints, const Point* pPointArray) override;
+    void drawPolygon(sal_uInt32 nPoints, const Point* pPointArray) override;
+    void drawPolyPolygon(sal_uInt32 nPoly, const sal_uInt32* pPoints,
+                         const Point** pPointArray) override;
+
+    bool drawPolyPolygon(const basegfx::B2DHomMatrix& rObjectToDevice,
+                         const basegfx::B2DPolyPolygon&, double fTransparency) override;
+
+    bool drawPolyLine(const basegfx::B2DHomMatrix& rObjectToDevice, const basegfx::B2DPolygon&,
+                      double fTransparency, double fLineWidth, const std::vector<double>* pStroke,
+                      basegfx::B2DLineJoin, css::drawing::LineCap, double fMiterMinimumAngle,
+                      bool bPixelSnapHairline) override;
+
+    bool drawPolyLineBezier(sal_uInt32 nPoints, const Point* pPointArray,
+                            const PolyFlags* pFlagArray) override;
+
+    bool drawPolygonBezier(sal_uInt32 nPoints, const Point* pPointArray,
+                           const PolyFlags* pFlagArray) override;
+
+    bool drawPolyPolygonBezier(sal_uInt32 nPoly, const sal_uInt32* pPoints,
+                               const Point* const* pPointArray,
+                               const PolyFlags* const* pFlagArray) override;
+
+    void copyArea(tools::Long nDestX, tools::Long nDestY, tools::Long nSrcX, tools::Long nSrcY,
+                  tools::Long nSrcWidth, tools::Long nSrcHeight, bool bWindowInvalidate) override;
+
+    void copyBits(const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics) override;
+
+    void drawBitmap(const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap) override;
+
+    void drawBitmap(const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap,
+                    const SalBitmap& rMaskBitmap) override;
+
+    void drawMask(const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap,
+                  Color nMaskColor) override;
+
+    std::shared_ptr<SalBitmap> getBitmap(tools::Long nX, tools::Long nY, tools::Long nWidth,
+                                         tools::Long nHeight) override;
+
+    Color getPixel(tools::Long nX, tools::Long nY) override;
+
+    void invert(tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight,
+                SalInvert nFlags) override;
+
+    void invert(sal_uInt32 nPoints, const Point* pPtAry, SalInvert nFlags) override;
+
+    bool drawEPS(tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight,
+                 void* pPtr, sal_uInt32 nSize) override;
+
+    bool blendBitmap(const SalTwoRect&, const SalBitmap& rBitmap) override;
+
+    bool blendAlphaBitmap(const SalTwoRect&, const SalBitmap& rSrcBitmap,
+                          const SalBitmap& rMaskBitmap, const SalBitmap& rAlphaBitmap) override;
+
+    bool drawAlphaBitmap(const SalTwoRect&, const SalBitmap& rSourceBitmap,
+                         const SalBitmap& rAlphaBitmap) override;
+
+    bool drawTransformedBitmap(const basegfx::B2DPoint& rNull, const basegfx::B2DPoint& rX,
+                               const basegfx::B2DPoint& rY, const SalBitmap& rSourceBitmap,
+                               const SalBitmap* pAlphaBitmap, double fAlpha) override;
+
+    bool hasFastDrawTransformedBitmap() const override;
+
+    bool drawAlphaRect(tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight,
+                       sal_uInt8 nTransparency) override;
+
+    bool drawGradient(const tools::PolyPolygon& rPolygon, const Gradient& rGradient) override;
+    bool implDrawGradient(basegfx::B2DPolyPolygon const& rPolyPolygon,
+                          SalGradient const& rGradient) override;
+
+    bool supportsOperation(OutDevSupportType eType) const override;
+
+private:
+    void drawScaledImage(const SalTwoRect& rPosAry, const QImage& rImage);
+};
+
+class Qt5Graphics final : public SalGraphicsAutoDelegateToImpl, public Qt5GraphicsBase
+{
+    friend class Qt5Bitmap;
+
+    std::unique_ptr<Qt5GraphicsBackend> m_pBackend;
+
+    Qt5Frame* m_pFrame;
+
     rtl::Reference<Qt5Font> m_pTextStyle[MAX_FALLBACK];
     Color m_aTextColor;
 
@@ -70,12 +187,16 @@ public:
     }
     virtual ~Qt5Graphics() override;
 
+    QImage* getQImage() { return m_pBackend->getQImage(); }
+
     void ChangeQImage(QImage* pImage);
 
     virtual SalGraphicsImpl* GetImpl() const override;
     virtual SystemGraphicsData GetGraphicsData() const override;
-    virtual bool supportsOperation(OutDevSupportType) const override;
-    virtual OUString getRenderBackendName() const override { return "qt5"; }
+    virtual OUString getRenderBackendName() const override
+    {
+        return m_pBackend->getRenderBackendName();
+    }
 
 #if ENABLE_CAIRO_CANVAS
     virtual bool SupportsCairo() const override;
@@ -92,85 +213,7 @@ public:
 
     // GDI
 
-    virtual bool setClipRegion(const vcl::Region&) override;
-    virtual void ResetClipRegion() override;
-
-    virtual void drawPixel(tools::Long nX, tools::Long nY) override;
-    virtual void drawPixel(tools::Long nX, tools::Long nY, Color nColor) override;
-    virtual void drawLine(tools::Long nX1, tools::Long nY1, tools::Long nX2,
-                          tools::Long nY2) override;
-    virtual void drawRect(tools::Long nX, tools::Long nY, tools::Long nWidth,
-                          tools::Long nHeight) override;
-    virtual void drawPolyLine(sal_uInt32 nPoints, const Point* pPtAry) override;
-    virtual void drawPolygon(sal_uInt32 nPoints, const Point* pPtAry) override;
-    virtual void drawPolyPolygon(sal_uInt32 nPoly, const sal_uInt32* pPoints,
-                                 const Point** pPtAry) override;
-    virtual bool drawPolyPolygon(const basegfx::B2DHomMatrix& rObjectToDevice,
-                                 const basegfx::B2DPolyPolygon&, double fTransparency) override;
-    virtual bool drawPolyLineBezier(sal_uInt32 nPoints, const Point* pPtAry,
-                                    const PolyFlags* pFlgAry) override;
-    virtual bool drawPolygonBezier(sal_uInt32 nPoints, const Point* pPtAry,
-                                   const PolyFlags* pFlgAry) override;
-    virtual bool drawPolyPolygonBezier(sal_uInt32 nPoly, const sal_uInt32* pPoints,
-                                       const Point* const* pPtAry,
-                                       const PolyFlags* const* pFlgAry) override;
-    virtual bool drawPolyLine(const basegfx::B2DHomMatrix& rObjectToDevice,
-                              const basegfx::B2DPolygon&, double fTransparency, double fLineWidths,
-                              const std::vector<double>* pStroke, // MM01
-                              basegfx::B2DLineJoin, css::drawing::LineCap eLineCap,
-                              double fMiterMinimumAngle, bool bPixelSnapHairline) override;
-    virtual bool drawGradient(const tools::PolyPolygon&, const Gradient&) override;
-
-    virtual void copyArea(tools::Long nDestX, tools::Long nDestY, tools::Long nSrcX,
-                          tools::Long nSrcY, tools::Long nSrcWidth, tools::Long nSrcHeight,
-                          bool bWindowInvalidate) override;
-
-    virtual void copyBits(const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics) override;
-    virtual void drawBitmap(const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap) override;
-    virtual void drawBitmap(const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap,
-                            const SalBitmap& rTransparentBitmap) override;
-    virtual void drawMask(const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap,
-                          Color nMaskColor) override;
-
-    virtual std::shared_ptr<SalBitmap> getBitmap(tools::Long nX, tools::Long nY, tools::Long nWidth,
-                                                 tools::Long nHeight) override;
-    virtual Color getPixel(tools::Long nX, tools::Long nY) override;
-
-    virtual void invert(tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight,
-                        SalInvert nFlags) override;
-    virtual void invert(sal_uInt32 nPoints, const Point* pPtAry, SalInvert nFlags) override;
-
-    virtual bool drawEPS(tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight,
-                         void* pPtr, sal_uInt32 nSize) override;
-
-    virtual bool blendBitmap(const SalTwoRect&, const SalBitmap& rBitmap) override;
-
-    virtual bool blendAlphaBitmap(const SalTwoRect&, const SalBitmap& rSrcBitmap,
-                                  const SalBitmap& rMaskBitmap,
-                                  const SalBitmap& rAlphaBitmap) override;
-
-    virtual bool drawAlphaBitmap(const SalTwoRect&, const SalBitmap& rSourceBitmap,
-                                 const SalBitmap& rAlphaBitmap) override;
-
-    bool drawTransformedBitmap(const basegfx::B2DPoint& rNull, const basegfx::B2DPoint& rX,
-                               const basegfx::B2DPoint& rY, const SalBitmap& rSourceBitmap,
-                               const SalBitmap* pAlphaBitmap, double fAlpha) override;
-    virtual bool hasFastDrawTransformedBitmap() const override;
-
-    virtual bool drawAlphaRect(tools::Long nX, tools::Long nY, tools::Long nWidth,
-                               tools::Long nHeight, sal_uInt8 nTransparency) override;
-
     virtual void GetResolution(sal_Int32& rDPIX, sal_Int32& rDPIY) override;
-    virtual sal_uInt16 GetBitCount() const override;
-    virtual tools::Long GetGraphicsWidth() const override;
-
-    virtual void SetLineColor() override;
-    virtual void SetLineColor(Color nColor) override;
-    virtual void SetFillColor() override;
-    virtual void SetFillColor(Color nColor) override;
-    virtual void SetXORMode(bool bSet, bool bInvertOnly) override;
-    virtual void SetROPLineColor(SalROPColor nROPColor) override;
-    virtual void SetROPFillColor(SalROPColor nROPColor) override;
 
     // Text rendering + font support