[QGIS Commit] r14705 - in trunk/qgis: ms-windows/osgeo4w src/app/legend

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-11-17 14:03:14 -0800 (Wed, 17 Nov 2010)
New Revision: 14705

Modified:
   trunk/qgis/ms-windows/osgeo4w/package.cmd
   trunk/qgis/src/app/legend/qgslegend.cpp
Log:
fix legend handling of collapsed layers

Modified: trunk/qgis/ms-windows/osgeo4w/package.cmd
===================================================================
--- trunk/qgis/ms-windows/osgeo4w/package.cmd	2010-11-17 21:05:02 UTC (rev 14704)
+++ trunk/qgis/ms-windows/osgeo4w/package.cmd	2010-11-17 22:03:14 UTC (rev 14705)
@@ -165,7 +165,7 @@
 
 tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-grass-plugin-%VERSION%-%PACKAGE%.tar.bz2 ^
 	--exclude-from exclude ^
-	--exclude "*.pyc" \
+	--exclude "*.pyc" ^
 	"apps/%PACKAGENAME%/themes/classic/grass" ^
 	"apps/%PACKAGENAME%/themes/default/grass" ^
 	"apps/%PACKAGENAME%/themes/gis/grass" ^

Modified: trunk/qgis/src/app/legend/qgslegend.cpp
===================================================================
--- trunk/qgis/src/app/legend/qgslegend.cpp	2010-11-17 21:05:02 UTC (rev 14704)
+++ trunk/qgis/src/app/legend/qgslegend.cpp	2010-11-17 22:03:14 UTC (rev 14705)
@@ -345,7 +345,7 @@
     int line_y;
     if ( layer )
     {
-      QTreeWidgetItem *lastItem = item->childCount() > 0 ? item->child( item->childCount() - 1 ) : item;
+      QTreeWidgetItem *lastItem = item->childCount() > 0 && item->isExpanded() ? item->child( item->childCount() - 1 ) : item;
       int y0 = visualItemRect( item ).top() + 1;
       int y1 = visualItemRect( lastItem ).bottom() - 2;