# HG changeset patch
# User insilmaril
# Date 1228841086 0
# Node ID 39b806972b03799809178fe12a26864e6debe587
# Parent  79b0656dbe7d8fdc2ee252cc9f947ab126846fc4
Bugfix for still visible images in scrolled branches

diff -r 79b0656dbe7d -r 39b806972b03 branchobj.cpp
--- a/branchobj.cpp	Thu Dec 04 13:47:47 2008 +0000
+++ b/branchobj.cpp	Tue Dec 09 16:44:46 2008 +0000
@@ -351,17 +351,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 childs, if I am not scrolled
 		if (!scrolled && (depth < toDepth))
 		{
 			// Now go recursivly through all childs
-			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 79b0656dbe7d -r 39b806972b03 tex/vym.changelog
--- a/tex/vym.changelog	Thu Dec 04 13:47:47 2008 +0000
+++ b/tex/vym.changelog	Tue Dec 09 16:44:46 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:39:55 CET 2008 - uwedr@suse.de
 
diff -r 79b0656dbe7d -r 39b806972b03 version.h
--- a/version.h	Thu Dec 04 13:47:47 2008 +0000
+++ b/version.h	Tue Dec 09 16:44:46 2008 +0000
@@ -4,10 +4,10 @@
 #include <QString>
 
 #define __VYM_NAME "VYM"
-#define __VYM_VERSION "1.12.2b"
+#define __VYM_VERSION "1.12.2c"
 #define __VYM_CODENAME "Maintenance Update "
 //#define __VYM_CODENAME "Codename: development version"
-#define __VYM_BUILD_DATE "2008-12-04"
+#define __VYM_BUILD_DATE "2008-12-08"
 
 
 bool checkVersion(const QString &);