X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fcircle.cpp;h=1f350b0341615f7cc2abbde872c0448c13e68b66;hb=86caae9cadd6e1877a4e6226533521ef0d1c6389;hp=d6ed3064b175b7fd2fe2310d8a8da0a3bce7b2df;hpb=ba6723b86d8dd67ebc7b11b245de3e7ff64f06b1;p=architektonas

diff --git a/src/circle.cpp b/src/circle.cpp
index d6ed306..1f350b0 100644
--- a/src/circle.cpp
+++ b/src/circle.cpp
@@ -87,6 +87,17 @@ Circle::~Circle()
 
 /*virtual*/ void Circle::PointerMoved(Vector point)
 {
+	if (selectionInProgress)
+	{
+		// Check for whether or not the rect contains this circle
+		if (selection.normalized().contains(Extents()))
+			state = OSSelected;
+		else
+			state = OSInactive;
+
+		return;
+	}
+
 	// Hit test tells us what we hit (if anything) through boolean variables. It
 	// also tells us whether or not the state changed.
 	needUpdate = HitTest(point);
@@ -115,21 +126,7 @@ Circle::~Circle()
 }
 
 
-/*virtual*/ QRectF Circle::Extents(void)
-{
-	return QRectF(QPointF(position.x - radius, position.y - radius), QPointF(position.x + radius, position.y + radius));
-}
-
-
-#if 0
-/*virtual*/ ObjectType Circle::Type(void)
-{
-	return OTCircle;
-}
-#endif
-
-
-bool Circle::HitTest(Point point)
+/*virtual*/ bool Circle::HitTest(Point point)
 {
 	SaveState();
 	hitCenter = hitCircle = false;
@@ -162,6 +159,12 @@ pointed at length with our on screen length.
 }
 
 
+/*virtual*/ QRectF Circle::Extents(void)
+{
+	return QRectF(QPointF(position.x - radius, position.y - radius), QPointF(position.x + radius, position.y + radius));
+}
+
+
 void Circle::SaveState(void)
 {
 	oldHitCenter = hitCenter;