[med-svn] [SCM] aghermann branch, master, updated. c0bd21ca8eb529ade7e0c7aad22951a308a8dc8f

[Andrei Zavada]

The following commit has been merged in the master branch:
commit b8a4a86be37515d3f320d42eeca3077cebf0cb4d
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Fri Apr 26 16:49:15 2013 +0300

    more accurate stacking of overlapping embedded annotation labels

diff --git a/src/ui/sf/montage.cc b/src/ui/sf/montage.cc
index 67af5e7..8e892cf 100644
--- a/src/ui/sf/montage.cc
+++ b/src/ui/sf/montage.cc
@@ -791,7 +791,7 @@ draw_montage( cairo_t* cr)
 					(last_label_end > wa)
 					? ++overlap_count * 12
 					: (overlap_count = 0);
-				last_label_end = wa + extents.width + 3;
+				last_label_end = max( wa + extents.width + 3, last_label_end);
 
 				_p.CwB[SExpDesignUI::TColour::sf_embedded_annotations].set_source_rgba( cr, .9);
 				cairo_set_line_width( cr, 2.5);

-- 
Sleep experiment manager