[MU4] fix #7819 - don't draw page elements onto beyond page bounding box

musescore · Jul 13, 2021 · abe8d18 · abe8d18
1 parent 2b4cfd5
commit abe8d18
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 0 deletions.
diff --git a/src/engraving/draw/ipaintprovider.h b/src/engraving/draw/ipaintprovider.h
@@ -80,6 +80,9 @@ class IPaintProvider
 
     virtual void drawPixmap(const PointF& point, const QPixmap& pm) = 0;
     virtual void drawTiledPixmap(const RectF& rect, const QPixmap& pm, const PointF& offset = PointF()) = 0;
+
+    virtual void setClipRect(const RectF& rect) = 0;
+    virtual void setClipping(bool enable) = 0;
 };
 
 using IPaintProviderPtr = std::shared_ptr<IPaintProvider>;

diff --git a/src/engraving/draw/painter.cpp b/src/engraving/draw/painter.cpp
@@ -498,3 +498,13 @@ void Painter::updateMatrix()
         extended->setTransform(st.transform);
     }
 }
+
+void Painter::setClipRect(const RectF& rect)
+{
+    m_provider->setClipRect(rect);
+}
+
+void Painter::setClipping(bool enable)
+{
+    m_provider->setClipping(enable);
+}
diff --git a/src/engraving/draw/painter.h b/src/engraving/draw/painter.h
@@ -164,6 +164,9 @@ class Painter
     void drawPixmap(const PointF& point, const QPixmap& pm);
     void drawTiledPixmap(const RectF& rect, const QPixmap& pm, const PointF& offset = PointF());
 
+    void setClipRect(const RectF& rect);
+    void setClipping(bool enable);
+
     //! NOTE Provider for tests.
     //! We're not ready to use DI (ModuleIoC) here yet
     static IPaintProviderPtr extended;

diff --git a/src/engraving/draw/qpainterprovider.cpp b/src/engraving/draw/qpainterprovider.cpp
@@ -304,3 +304,13 @@ void QPainterProvider::drawTiledPixmap(const RectF& rect, const QPixmap& pm, con
 {
     m_painter->drawTiledPixmap(rect.toQRectF(), pm, QPointF(offset.x(), offset.y()));
 }
+
+void QPainterProvider::setClipRect(const RectF& rect)
+{
+    m_painter->setClipRect(rect.toQRectF());
+}
+
+void QPainterProvider::setClipping(bool enable)
+{
+    m_painter->setClipping(enable);
+}
diff --git a/src/engraving/draw/qpainterprovider.h b/src/engraving/draw/qpainterprovider.h
@@ -81,6 +81,9 @@ class QPainterProvider : public IPaintProvider
     void drawPixmap(const PointF& point, const QPixmap& pm) override;
     void drawTiledPixmap(const RectF& rect, const QPixmap& pm, const PointF& offset = PointF()) override;
 
+    void setClipRect(const RectF& rect) override;
+    void setClipping(bool enable) override;
+
 private:
     QPainter* m_painter = nullptr;
     bool m_overship = false;

diff --git a/src/notation/internal/notation.cpp b/src/notation/internal/notation.cpp
@@ -326,11 +326,14 @@ void Notation::paintPages(draw::Painter* painter, const RectF& frameRect, const
         PointF pagePosition(page->pos());
         painter->translate(pagePosition);
         paintForeground(painter, page->bbox());
+        painter->setClipping(true);
+        painter->setClipRect(page->bbox());
 
         QList<Element*> elements = page->items(frameRect.translated(-page->pos()));
         Ms::paintElements(*painter, elements);
 
         painter->translate(-pagePosition);
+        painter->setClipping(false);
     }
 }