Bugfix for still visible images in scrolled branches
authorinsilmaril
Tue, 09 Dec 2008 16:44:54 +0000
changeset 7300594d7b7099d
parent 729 7ddbe3fa34a1
child 731 c8b1a3564c74
Bugfix for still visible images in scrolled branches
branchobj.cpp
mapeditor.cpp
tex/vym.changelog
     1.1 --- a/branchobj.cpp	Mon Dec 08 16:57:33 2008 +0000
     1.2 +++ b/branchobj.cpp	Tue Dec 09 16:44:54 2008 +0000
     1.3 @@ -350,17 +350,18 @@
     1.4  		standardFlags->setVisibility(v);
     1.5  		LinkableMapObj::setVisibility (v);
     1.6  		
     1.7 +		int i;
     1.8 +		for (i=0; i<floatimage.size(); ++i)
     1.9 +			floatimage.at(i)->setVisibility (v);
    1.10 +		for (i=0; i<xlink.size(); ++i)	
    1.11 +			xlink.at(i)->setVisibility ();	
    1.12 +
    1.13  		// Only change children, if I am not scrolled
    1.14  		if (!scrolled && (depth < toDepth))
    1.15  		{
    1.16  			// Now go recursivly through all children
    1.17 -			int i;
    1.18  			for (i=0; i<branch.size(); ++i)
    1.19  				branch.at(i)->setVisibility (v,toDepth);	
    1.20 -			for (i=0; i<floatimage.size(); ++i)
    1.21 -				floatimage.at(i)->setVisibility (v);
    1.22 -			for (i=0; i<xlink.size(); ++i)	
    1.23 -				xlink.at(i)->setVisibility ();	
    1.24  		}
    1.25      } // depth <= toDepth	
    1.26  	requestReposition();
     2.1 --- a/mapeditor.cpp	Mon Dec 08 16:57:33 2008 +0000
     2.2 +++ b/mapeditor.cpp	Tue Dec 09 16:44:54 2008 +0000
     2.3 @@ -542,8 +542,6 @@
     2.4  		cout << "  lmo="<<lmo<<endl;
     2.5  		cout << "  h="<<((BranchObj*)lmo)->getHeading().toStdString()<<endl;
     2.6  		// Select the clicked object
     2.7 -		// FIXME VM use index & signal below instead of lmo   
     2.8 -		// model->selectInt (lmo);
     2.9  
    2.10  		// FIXME VM better let "find" return an index instead of lmo...
    2.11  		// Get index of clicked LMO
     3.1 --- a/tex/vym.changelog	Mon Dec 08 16:57:33 2008 +0000
     3.2 +++ b/tex/vym.changelog	Tue Dec 09 16:44:54 2008 +0000
     3.3 @@ -1,3 +1,9 @@
     3.4 +-------------------------------------------------------------------
     3.5 +Mon Dec  8 20:26:41 CET 2008 - uwedr@suse.de
     3.6 +
     3.7 +- Bugfix: Images linked to a scrolled branch were not hidden, if parent
     3.8 +           branch was scrolled
     3.9 +		   
    3.10  -------------------------------------------------------------------
    3.11  Mon Dec  1 17:43:30 CET 2008 - uwedr@suse.de
    3.12