X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fcontainer.cpp;h=9c3d403bf74b8864af6cfea0b0a4a0f2e036c520;hb=8d80165e3ab9173b8689b3b3420b40bf3020161f;hp=976172fb38220f094838a7cc806ab1fa482a9712;hpb=dbfab6256efe6b03e9750e33081d9dcdcdfc1c34;p=architektonas

diff --git a/src/container.cpp b/src/container.cpp
index 976172f..9c3d403 100644
--- a/src/container.cpp
+++ b/src/container.cpp
@@ -54,22 +54,12 @@ Container & Container::operator=(const Container & from)
 		return *this;
 
 	Clear();
-
-	// Small problem with this approach: if the copied object goes out of scope,
-	// all of the objects we copied in here will be deleted. D'oh!
-	// For this COPY constructor to be meaningful, we have to actually COPY the
-	// objects in this Container, not just MOVE a copy of the POINTER! D-:
 	std::vector<Object *>::const_iterator i;
 
-//	for(uint i=0; i<from.objects.size(); i++)
 	for(i=from.objects.begin(); i!=from.objects.end(); i++)
 	{
-//		Object * object = from.objects[i];
+printf("Container: Copying object $%08X...\n", *i);
 		Object * object = (*i)->Copy();
-
-		// Need to actually COPY the object here, not copy the pointer only!!
-		// (which we do now, above :-P)
-
 		objects.push_back(object);
 	}
 
@@ -133,12 +123,13 @@ having to ungroup them first (like Inkscape).
 /*virtual*/ bool Container::Collided(Vector point)
 {
 	objectWasDragged = false;
-//	Vector v1 = position - point;
-
 	bool collision = false;
+	lastObjectClicked = NULL;
 
-	// NOTE that this deletes the object on mouse down instead of mouse up. Have to
-	// check to see how it feels to do it that way...
+	// NOTE that this deletes the object on mouse down instead of mouse up.
+	// Have to check to see how it feels to do it that way...
+	// N.B.: This only works because the toolAction is not set, &
+	//       Object::ignoreClicks isn't set either...
 	if (deleteActive)
 	{
 		for(std::vector<Object *>::iterator i=objects.begin(); i!=objects.end();)
@@ -159,7 +150,11 @@ printf("Container::Collided: Deleting object ($%X)\n", *i);
 		for(std::vector<Object *>::iterator i=objects.begin(); i!=objects.end(); i++)
 		{
 			if ((*i)->Collided(point))
+			{
 				collision = true;
+				lastObjectClicked = *i;
+//printf("Container::Collided: lastObjectClicked = %X\n", lastObjectClicked);
+			}
 		}
 	}
 
@@ -206,9 +201,10 @@ class so that we can leverage that stuff here as well.
 // into parts and keep subdividing until an acceptable number of objects lie within
 // the slice. This way, the GUI will still be responsive and *not* have to test
 // every object for collision.
-/*virtual*/ void Container::PointerMoved(Vector point)
+/*virtual*/ bool Container::PointerMoved(Vector point)
 {
 	std::vector<Object *>::iterator i;
+	lastObjectHovered = penultimateObjectHovered = NULL;
 
 	if (!isTopLevelContainer)
 	{
@@ -220,7 +216,7 @@ class so that we can leverage that stuff here as well.
 			else
 				state = OSInactive;
 
-			return;
+			return false;
 		}
 
 		// No need to do any checking if we're already selected...
@@ -258,17 +254,22 @@ class so that we can leverage that stuff here as well.
 			needUpdate = true;
 		}
 
-		return;
+		return false;
 	}
 
 	for(std::vector<Object *>::iterator i=objects.begin(); i!=objects.end(); i++)
 	{
 //		if (objects[i]->GetState() == OSSelected)
-		(*i)->PointerMoved(point);
+		if ((*i)->PointerMoved(point))
+		{
+			penultimateObjectHovered = lastObjectHovered;
+			lastObjectHovered = *i;
+		}
 	}
 
 	// Generic container doesn't need this???
 //	needUpdate = false;
+	return (lastObjectHovered == NULL ? false : true);
 }
 
 
@@ -493,7 +494,7 @@ void Container::CopySelectedContentsTo(Container * newContainer)
 	if (newContainer == NULL)
 		return;
 
-	// Shuffle the contents of this container to the new one
+	// Copy the contents of this container to the new one
 	for(std::vector<Object *>::iterator i=objects.begin(); i!=objects.end(); i++)
 	{
 		if ((*i)->state == OSSelected)