Fix tool handling and circle highlighting.

[architektonas] / src / circle.cpp

diff --git a/src/circle.cpp b/src/circle.cpp
index af8f91f3be2c152bf4c906d4ed3dd767f2e0054c..0780f6258bc32f67a94e3d097a5a797f3d6094c1 100644 (file)
--- a/src/circle.cpp
+++ b/src/circle.cpp
@@ -127,10 +127,20 @@ bool Circle::HitTest(Point point)
 Document passes in the correct Cartesian coordinates being pointed to by the mouse.
 So all we have to be concerned with is properly scaling our hot zones/handle sizes,
 since we generally *don't* want those to scale with the zoom level. ;-)
+
+What is going on here?
+If we're zoomed out to, say, 50%, & our radius is 10.0 (absolute), then on screen
+the radius will be 5.0. By multiplying the length by the zoom factor, we align our
+pointed at length with our on screen length.
 */
-       if (length < 8.0)
+       if ((length * Painter::zoom) < 8.0)
                hitCenter = true;
-       else if ((length < (radius + 2.0)) && (length > (radius - 2.0)))
+//wrong:       else if ((length < (radius + 2.0)) && (length > (radius - 2.0)))
+/*NB: The following should be identical to what we have down below, but it doesn't work out that way... :-P */
+//close, but no        else if (((length * Painter::zoom) < ((radius * Painter::zoom) + 2.0)) && ((length * Painter::zoom) > ((radius * Painter::zoom) - 2.0)))
+//really wrong!        else if (((length * Painter::zoom) < (radius + 2.0)) && ((length * Painter::zoom) > (radius - 2.0)))
+// close again, but sill no    else if (((length * Painter::zoom) < ((radius + 2.0) * Painter::zoom)) && ((length * Painter::zoom) > ((radius - 2.0) * Painter::zoom)))
+       else if ((fabs(length - radius) * Painter::zoom) < 2.0)
                hitCircle = true;
 
        return StateChanged();