branchobj.cpp
changeset 804 14f2b1b15242
parent 798 d251c7b2de54
child 814 31de6677aa96
     1.1 --- a/branchobj.cpp	Fri Oct 02 14:31:03 2009 +0000
     1.2 +++ b/branchobj.cpp	Fri Nov 13 08:32:03 2009 +0000
     1.3 @@ -115,7 +115,7 @@
     1.4  		return false;
     1.5  }
     1.6  
     1.7 -void BranchObj::setParObjTmp(LinkableMapObj* dst, QPointF m, int off)	//FIXME-1 after moving a mainbranch to a branch and away again mainbranch is no longer connected to mapcenter...
     1.8 +void BranchObj::setParObjTmp(LinkableMapObj* dst, QPointF m, int off)	//FIXME-1 when moving a mainbranch to a branch it still has relPos, not moved as child
     1.9  {
    1.10  	// Temporary link to dst
    1.11  	// m is position of mouse pointer 
    1.12 @@ -125,7 +125,7 @@
    1.13  
    1.14  	BranchItem *pi=(BranchItem*)(dsti->parent());
    1.15  	int pi_depth=pi->depth();
    1.16 -	BranchObj* bo=(BranchObj*)(dst);
    1.17 +	BranchObj* bo=(BranchObj*)dst;
    1.18  
    1.19  	if (!tmpParent) 
    1.20  	{
    1.21 @@ -490,6 +490,10 @@
    1.22  			setFrameType (FrameObj::Rectangle);
    1.23  			break;
    1.24  		case 1: 
    1.25 +			fontsize=14; 
    1.26 +			setFrameType (FrameObj::NoFrame);
    1.27 +			break;
    1.28 +		case 2: 
    1.29  			fontsize=12; 
    1.30  			setFrameType (FrameObj::NoFrame);
    1.31  			break;