issue-1864: Fix fill misbehaving when drawing was partly outside border

MrStevns · Jul 23, 2024 · 4c78d3f · 4c78d3f
1 parent eba8d6d
commit 4c78d3f
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/core_lib/src/graphics/bitmap/bitmapimage.cpp b/core_lib/src/graphics/bitmap/bitmapimage.cpp
@@ -880,8 +880,7 @@ bool* BitmapImage::floodFillPoints(const BitmapImage* targetImage,
 {
     QRgb oldColor = targetImage->constScanLine(point.x(), point.y());
     oldColor = qRgba(qRed(oldColor), qGreen(oldColor), qBlue(oldColor), qAlpha(oldColor));
-    QRect borderBounds = searchBounds.intersected(maxBounds);
-    searchBounds = searchBounds.adjusted(-1, -1, 1, 1).intersected(maxBounds);
+    searchBounds = searchBounds.adjusted(-1, -1, 1, 1).united(maxBounds);
 
     // Preparations
     QList<QPoint> queue; // queue all the pixels of the filled area (as they are found)
@@ -921,7 +920,7 @@ bool* BitmapImage::floodFillPoints(const BitmapImage* targetImage,
         int yCoord = point.y() - maxBounds.top();
 
         // In case we fill outside the searchBounds, expand the search area to the max.
-        if (!borderBounds.contains(point)) {
+        if (!searchBounds.contains(point)) {
             checkOutside = true;
         }