branchobj.cpp
changeset 629 92bebad145d2
parent 616 16d63fc9ae42
child 638 3436b8eb3d9b
     1.1 --- a/branchobj.cpp	Thu Nov 08 15:28:03 2007 +0000
     1.2 +++ b/branchobj.cpp	Wed Dec 05 14:58:02 2007 +0000
     1.3 @@ -740,12 +740,14 @@
     1.4  
     1.5  void BranchObj::setHideTmp (HideTmpMode mode)
     1.6  {
     1.7 -	if (mode==HideExport && hasHiddenExportParent())
     1.8 +	if (mode==HideExport && (hideExport|| hasHiddenExportParent() ) )
     1.9  	{
    1.10 +		// Hide stuff according to hideExport flag and parents
    1.11  		setVisibility (false);
    1.12  		hidden=true;
    1.13  	}else
    1.14  	{
    1.15 +		// Do not hide, but still take care of scrolled status
    1.16  		if (hasScrolledParent(this))
    1.17  			setVisibility (false);
    1.18  		else
    1.19 @@ -753,6 +755,7 @@
    1.20  		hidden=false;
    1.21  	}	
    1.22  
    1.23 +	// And take care of my childs
    1.24  	for (int i=0; i<branch.size(); ++i)
    1.25  		branch.at(i)->setHideTmp (mode);
    1.26  }
    1.27 @@ -760,9 +763,9 @@
    1.28  bool BranchObj::hasHiddenExportParent()
    1.29  {
    1.30  	// Calls parents recursivly to
    1.31 -	// find out, if we are temp. hidden
    1.32 +	// find out, if we or parents are temp. hidden
    1.33  
    1.34 -	if (hideExport) return true;
    1.35 +	if (hidden || hideExport) return true;
    1.36  
    1.37  	BranchObj* bo=(BranchObj*)parObj;
    1.38  	if (bo) 
    1.39 @@ -807,7 +810,7 @@
    1.40  		idAttr="";
    1.41  
    1.42      s=beginElement ("branch" 
    1.43 -		+getOrnAttr() 
    1.44 +		+getOrnXMLAttr() 
    1.45  		+scrolledAttr 
    1.46  		+areaAttr 
    1.47  		+idAttr