When grouping layer tree nodes, insert new group at the same position

wonder-sk · wonder-sk · commit c05e5e2825cc · 2014-07-17T00:38:40.000+02:00
diff --git a/src/gui/layertree/qgslayertreeviewdefaultactions.cpp b/src/gui/layertree/qgslayertreeviewdefaultactions.cpp
@@ -260,21 +260,24 @@ void QgsLayerTreeViewDefaultActions::makeTopLevel()
 void QgsLayerTreeViewDefaultActions::groupSelected()
 {
   QList<QgsLayerTreeNode*> nodes = mView->selectedNodes( true );
-  if ( nodes.count() < 2 )
+  if ( nodes.count() < 2 || ! QgsLayerTree::isGroup( nodes[0]->parent() ) )
     return;
 
-  QgsLayerTreeGroup* parentGroup = mView->layerTreeModel()->rootGroup();
+  QgsLayerTreeGroup* parentGroup = QgsLayerTree::toGroup( nodes[0]->parent() );
+  int insertIdx = parentGroup->children().indexOf( nodes[0] );
 
   QgsLayerTreeGroup* newGroup = new QgsLayerTreeGroup( uniqueGroupName( parentGroup ) );
   foreach ( QgsLayerTreeNode* node, nodes )
     newGroup->addChildNode( node->clone() );
 
-  parentGroup->addChildNode( newGroup );
+  parentGroup->insertChildNode( insertIdx, newGroup );
 
   foreach ( QgsLayerTreeNode* node, nodes )
   {
     QgsLayerTreeGroup* group = qobject_cast<QgsLayerTreeGroup*>( node->parent() );
     if ( group )
       group->removeChildNode( node );
   }
+
+  mView->setCurrentIndex( mView->layerTreeModel()->node2index( newGroup ) );
 }

Original file line number	Diff line number	Diff line change
`@@ -260,21 +260,24 @@ void QgsLayerTreeViewDefaultActions::makeTopLevel()`
`260`	`260`	`void QgsLayerTreeViewDefaultActions::groupSelected()`
`261`	`261`	`{`
`262`	`262`	`QList<QgsLayerTreeNode*> nodes = mView->selectedNodes( true );`
`263`		`- if ( nodes.count() < 2 )`
	`263`	`+ if ( nodes.count() < 2 \|\| ! QgsLayerTree::isGroup( nodes[0]->parent() ) )`
`264`	`264`	`return;`
`265`	`265`
`266`		`- QgsLayerTreeGroup* parentGroup = mView->layerTreeModel()->rootGroup();`
	`266`	`+ QgsLayerTreeGroup* parentGroup = QgsLayerTree::toGroup( nodes[0]->parent() );`
	`267`	`+ int insertIdx = parentGroup->children().indexOf( nodes[0] );`
`267`	`268`
`268`	`269`	`QgsLayerTreeGroup* newGroup = new QgsLayerTreeGroup( uniqueGroupName( parentGroup ) );`
`269`	`270`	`foreach ( QgsLayerTreeNode* node, nodes )`
`270`	`271`	`newGroup->addChildNode( node->clone() );`
`271`	`272`
`272`		`- parentGroup->addChildNode( newGroup );`
	`273`	`+ parentGroup->insertChildNode( insertIdx, newGroup );`
`273`	`274`
`274`	`275`	`foreach ( QgsLayerTreeNode* node, nodes )`
`275`	`276`	`{`
`276`	`277`	`QgsLayerTreeGroup* group = qobject_cast<QgsLayerTreeGroup*>( node->parent() );`
`277`	`278`	`if ( group )`
`278`	`279`	`group->removeChildNode( node );`
`279`	`280`	`}`
	`281`	`+`
	`282`	`+ mView->setCurrentIndex( mView->layerTreeModel()->node2index( newGroup ) );`
`280`	`283`	`}`