diff -r 5391ab620c95 -r bb94eec7c8f3 branchobj.cpp
--- a/branchobj.cpp	Wed Sep 06 12:47:06 2006 +0000
+++ b/branchobj.cpp	Thu Sep 21 13:48:05 2006 +0000
@@ -664,6 +664,7 @@
 
 void BranchObj::setDockPos()
 {
+	// Sets childpos and parpos depending on orientation
 	if (getOrientation()==OrientLeftOfCenter )
     {
 		childPos=QPoint (ornamentsBBox.bottomLeft().x(), ornamentsBBox.bottomLeft().y() );
@@ -674,6 +675,7 @@
 		parPos=QPoint (ornamentsBBox.bottomLeft().x(),ornamentsBBox.bottomLeft().y() );
     }
 }
+
 LinkableMapObj* BranchObj::findMapObj(QPoint p, LinkableMapObj* excludeLMO)
 {
 	// Search branches
@@ -1242,30 +1244,42 @@
 	int th = bboxTotal.height();	
 // TODO testing
 /*
-	cout << "BO::alignRelTo "<<getHeading()<<endl;
+	cout << "BO::alignRelTo "<<getHeading().ascii()<<endl;
 	cout << "  d="<<depth<<
 		"  ref="<<ref<<
 //		"  bbox.topLeft="<<bboxTotal.topLeft()<<
 		"  absPos="<<absPos<<
+		"  relPos="<<relPos<<
+		"  orient="<<orientation<<
 //		"  pad="<<topPad<<","<<botPad<<","<<leftPad<<","<<rightPad<<
-		"  hidden="<<hidden<<
-		"  th="<<th<<endl;
+//		"  hidden="<<hidden<<
+//		"  th="<<th<<
+		endl;
 */
 
-	// If I am the mapcenter or a mainbranch, reposition heading
+	setOrientation();
+	//updateLink();
+
 	if (depth<2)
 	{
 		if (depth==1)
+		{
+			// Position relatively, if needed
+			//if (useRelPos) move2RelPos (relPos.x(), relPos.y());
+
 			// Calc angle to mapCenter if I am a mainbranch
 			// needed for reordering the mainbranches clockwise 
 			// around mapcenter 
 			angle=getAngle (QPoint ((int)(x() - parObj->getChildPos().x() ), 
 									(int)(y() - parObj->getChildPos().y() ) ) );
+		}							
 	} 
 	else
     {
 		// Align myself depending on orientation and parent, but
-		// only if I am not the mainbranch or mapcenter itself
+		// only if I am not a mainbranch or mapcenter itself
+		LinkOrient o;
+		o=parObj->getOrientation();
 		switch (orientation) 
 		{
 			case OrientLeftOfCenter:
@@ -1311,10 +1325,13 @@
 {	
 /* TODO testing only
 	if (!getHeading().isEmpty())
-		cout << "BO::reposition  "<<getHeading()<<endl;
+		cout << "BO::reposition  "<<getHeading().ascii()<<endl;
 	else	
 		cout << "BO::reposition  ???"<<endl;
+
+	cout << "  orient="<<orientation<<endl;
 */		
+
 	if (depth==0)
 	{
 		// only calculate the sizes once. If the deepest LMO 
@@ -1323,6 +1340,7 @@
 		calcBBoxSizeWithChilds();
 		updateLink();	// This update is needed if the canvas is resized 
 						// due to excessive moving of a FIO
+						// FIXME really needed? reposition is also called from updateLink...
 
 	    alignRelativeTo ( QPoint (absPos.x(),
 			absPos.y()-(bboxTotal.height()-bbox.height())/2) );
@@ -1337,6 +1355,16 @@
 	}
 }
 
+void BranchObj::unsetAllRepositionRequests()
+{
+	repositionRequest=false;
+	BranchObj *b;
+	for (b=branch.first(); b; b=branch.next() ) 
+	{
+		b->unsetAllRepositionRequests();
+	}	
+}
+
 
 QRect BranchObj::getTotalBBox()
 {