Merge pull request #21 from J5lx/MrStevns/painting-blitting-improveme…

…nts-v2 Fix ScribbleArea repaint when tiled buffer does not cover update rect
MrStevns · Sep 18, 2023 · e79a399 · e79a399
2 parents 3566a5a + 1f6d93c
commit e79a399
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/core_lib/src/canvaspainter.cpp b/core_lib/src/canvaspainter.cpp
@@ -299,7 +299,7 @@ void CanvasPainter::paintCurrentBitmapFrame(QPainter& painter, const QRect& blit
         // so in that case, in order to see the previously laid-down polyline stroke,
         // the surrounding area must be drawn again before
         // applying the new tiled output on top
-        if (mOptions.bIgnoreCanvasBuffer) {
+        if (!blitRect.contains(mTiledBuffer->bounds()) || mOptions.bIgnoreCanvasBuffer) {
             currentBitmapPainter.setCompositionMode(QPainter::CompositionMode_Source);
             currentBitmapPainter.drawImage(paintedImage->topLeft(), *paintedImage->image());
         }

diff --git a/core_lib/src/interface/scribblearea.cpp b/core_lib/src/interface/scribblearea.cpp
@@ -1031,7 +1031,7 @@ void ScribbleArea::paintEvent(QPaintEvent* event)
 
     // paints the canvas
     painter.setWorldMatrixEnabled(false);
-    painter.drawPixmap(QPoint(0, 0), mCanvas);
+    painter.drawPixmap(event->rect(), mCanvas, event->rect());
 
     currentTool()->paint(painter);