# HG changeset patch
# User insilmaril
# Date 1228841094 0
# Node ID 0594d7b7099d35c0574cd489e65bcba681ff3b3c
# Parent  7ddbe3fa34a10609dadd191e763f158778e91298
Bugfix for still visible images in scrolled branches

diff -r 7ddbe3fa34a1 -r 0594d7b7099d branchobj.cpp
--- a/branchobj.cpp	Mon Dec 08 16:57:33 2008 +0000
+++ b/branchobj.cpp	Tue Dec 09 16:44:54 2008 +0000
@@ -350,17 +350,18 @@
 		standardFlags->setVisibility(v);
 		LinkableMapObj::setVisibility (v);
 		
+		int i;
+		for (i=0; i<floatimage.size(); ++i)
+			floatimage.at(i)->setVisibility (v);
+		for (i=0; i<xlink.size(); ++i)	
+			xlink.at(i)->setVisibility ();	
+
 		// Only change children, if I am not scrolled
 		if (!scrolled && (depth < toDepth))
 		{
 			// Now go recursivly through all children
-			int i;
 			for (i=0; i<branch.size(); ++i)
 				branch.at(i)->setVisibility (v,toDepth);	
-			for (i=0; i<floatimage.size(); ++i)
-				floatimage.at(i)->setVisibility (v);
-			for (i=0; i<xlink.size(); ++i)	
-				xlink.at(i)->setVisibility ();	
 		}
     } // depth <= toDepth	
 	requestReposition();
diff -r 7ddbe3fa34a1 -r 0594d7b7099d mapeditor.cpp
--- a/mapeditor.cpp	Mon Dec 08 16:57:33 2008 +0000
+++ b/mapeditor.cpp	Tue Dec 09 16:44:54 2008 +0000
@@ -542,8 +542,6 @@
 		cout << "  lmo="<<lmo<<endl;
 		cout << "  h="<<((BranchObj*)lmo)->getHeading().toStdString()<<endl;
 		// Select the clicked object
-		// FIXME VM use index & signal below instead of lmo   
-		// model->selectInt (lmo);
 
 		// FIXME VM better let "find" return an index instead of lmo...
 		// Get index of clicked LMO
diff -r 7ddbe3fa34a1 -r 0594d7b7099d tex/vym.changelog
--- a/tex/vym.changelog	Mon Dec 08 16:57:33 2008 +0000
+++ b/tex/vym.changelog	Tue Dec 09 16:44:54 2008 +0000
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Dec  8 20:26:41 CET 2008 - uwedr@suse.de
+
+- Bugfix: Images linked to a scrolled branch were not hidden, if parent
+           branch was scrolled
+		   
 -------------------------------------------------------------------
 Mon Dec  1 17:43:30 CET 2008 - uwedr@suse.de