Fix expanded/collapsed state when loading layer tree from old project files

wonder-sk · wonder-sk · commit 9af0b376b3da · 2014-06-13T17:22:04.000+07:00
diff --git a/src/core/layertree/qgslayertreeutils.cpp b/src/core/layertree/qgslayertreeutils.cpp
@@ -204,7 +204,6 @@ static void _readOldLegendGroup( const QDomElement& groupElem, QgsLayerTreeGroup
   QDomNodeList groupChildren = groupElem.childNodes();
 
   QgsLayerTreeGroup* groupNode = new QgsLayerTreeGroup( groupElem.attribute( "name" ) );
-  parent->addChildNode( groupNode );
 
   groupNode->setVisible( QgsLayerTreeUtils::checkStateFromXml( groupElem.attribute( "checked" ) ) );
   groupNode->setExpanded( groupElem.attribute( "open" ) == "true" );
@@ -227,6 +226,8 @@ static void _readOldLegendGroup( const QDomElement& groupElem, QgsLayerTreeGroup
       _readOldLegendGroup( currentChildElem, groupNode );
     }
   }
+
+  parent->addChildNode( groupNode );
 }
 
 static void _readOldLegendLayer( const QDomElement& layerElem, QgsLayerTreeGroup* parent )

Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,6 @@ static void _readOldLegendGroup( const QDomElement& groupElem, QgsLayerTreeGroup`
`204`	`204`	`QDomNodeList groupChildren = groupElem.childNodes();`
`205`	`205`
`206`	`206`	`QgsLayerTreeGroup* groupNode = new QgsLayerTreeGroup( groupElem.attribute( "name" ) );`
`207`		`- parent->addChildNode( groupNode );`
`208`	`207`
`209`	`208`	`groupNode->setVisible( QgsLayerTreeUtils::checkStateFromXml( groupElem.attribute( "checked" ) ) );`
`210`	`209`	`groupNode->setExpanded( groupElem.attribute( "open" ) == "true" );`
`@@ -227,6 +226,8 @@ static void _readOldLegendGroup( const QDomElement& groupElem, QgsLayerTreeGroup`
`227`	`226`	`_readOldLegendGroup( currentChildElem, groupNode );`
`228`	`227`	`}`
`229`	`228`	`}`
	`229`	`+`
	`230`	`+ parent->addChildNode( groupNode );`
`230`	`231`	`}`
`231`	`232`
`232`	`233`	`static void _readOldLegendLayer( const QDomElement& layerElem, QgsLayerTreeGroup* parent )`