diff -r 72cc3873306a -r 494e8f40f0f7 ornamentedobj.cpp
--- a/ornamentedobj.cpp	Mon Sep 05 11:56:31 2005 +0000
+++ b/ornamentedobj.cpp	Tue Jan 03 09:44:41 2006 +0000
@@ -53,9 +53,6 @@
 	standardFlags=new FlagRowObj(canvas);
 	standardFlags->clone(standardFlagsDefault);
 	standardFlags->setName ("standardFlags");
-
-
-
 }
 
 void OrnamentedObj::copy (OrnamentedObj* other)
@@ -89,21 +86,26 @@
 }
 
 
-void OrnamentedObj::move (double x, double y)
+void OrnamentedObj::positionContents()
 {
-	MapObj::move (x,y);
-	double dx=frame->getBorder()/2;  // care for border around object
-	double dy=frame->getBorder()/2;
-	systemFlags-> move (x + dx, y + dy);
+	double d=frame->getBorder()/2;
+	double x=absPos.x();
+	double y=absPos.y();
+	systemFlags-> move (x + d, y + d );
 
 	// vertical align heading to bottom
 	int h=max (systemFlags->getBBox().height(), standardFlags->getBBox().height());
 	h=max (h,heading->getHeight());
-    heading->move (x + dx + systemFlags->getBBox().width(),
-					y + dy  + h - heading->getHeight() 
+    heading->move (x + d + systemFlags->getBBox().width(),
+					y + d  + h - heading->getHeight() 
 					);
-	standardFlags->move (x + heading->getWidth() + systemFlags->getBBox().width(), y + dy );				
+	standardFlags->move (x + heading->getWidth() + systemFlags->getBBox().width() + d , y + d  );
+}
 
+void OrnamentedObj::move (double x, double y)
+{
+	MapObj::move (x,y);
+	positionContents();
 	updateLink();
 	requestReposition();
 }