fix legend handling of collapsed layers

jef · jef · commit 9e9eec94aa02 · 2010-11-17T22:03:14.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14705 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd
@@ -165,7 +165,7 @@ if errorlevel 1 goto error
 
 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" ^
diff --git a/src/app/legend/qgslegend.cpp b/src/app/legend/qgslegend.cpp
@@ -345,7 +345,7 @@ void QgsLegend::mouseMoveEvent( QMouseEvent * e )
     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;
 

Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,7 @@ void QgsLegend::mouseMoveEvent( QMouseEvent * e )`
`345`	`345`	`int line_y;`
`346`	`346`	`if ( layer )`
`347`	`347`	`{`
`348`		`- QTreeWidgetItem *lastItem = item->childCount() > 0 ? item->child( item->childCount() - 1 ) : item;`
	`348`	`+ QTreeWidgetItem *lastItem = item->childCount() > 0 && item->isExpanded() ? item->child( item->childCount() - 1 ) : item;`
`349`	`349`	`int y0 = visualItemRect( item ).top() + 1;`
`350`	`350`	`int y1 = visualItemRect( lastItem ).bottom() - 2;`
`351`	`351`