Improve test in Geometry::covers

Horizontally, the old code would count an extra pixel on the right.

The vertical test is not changed, and should be eventually audited.

Fixes bug #10468.

diff --git a/src/CoordCache.h b/src/CoordCache.h
index 38842be83cb0fa6f2ad81e5920912abf2a170f8e..d1c0fa341723c3976da9b9581babdf29445fadc3 100644 (file)
--- a/src/CoordCache.h
+++ b/src/CoordCache.h
@@ -31,10 +31,8 @@ struct Geometry {
 
        bool covers(int x, int y) const
        {
-               return x >= pos.x_
-                       && x <= pos.x_ + dim.wid
-                       && y >= pos.y_ - dim.asc
-                       && y <= pos.y_ + dim.des;
+               return x >= pos.x_ && x < pos.x_ + dim.wid
+                      && y >= pos.y_ - dim.asc && y <= pos.y_ + dim.des;
        }
 
        int squareDistance(int x, int y) const