From 9f0d4c00ea383fc73a9bc4ef104c3c0c277d78d2 Mon Sep 17 00:00:00 2001
From: dfighter1985 <dfighter1985@localhost>
Date: Wed, 24 Sep 2014 23:56:11 +0200
Subject: [PATCH] When repareting a widget, remove the old item from the
 hierarchy and add a new one at the right place.

---
 .../plugins/gui_editor/widget_hierarchy.cpp   | 48 +++++++++++++++++++
 .../src/plugins/gui_editor/widget_hierarchy.h |  2 +
 2 files changed, 50 insertions(+)

diff --git a/code/studio/src/plugins/gui_editor/widget_hierarchy.cpp b/code/studio/src/plugins/gui_editor/widget_hierarchy.cpp
index 8318ea926..333386aca 100644
--- a/code/studio/src/plugins/gui_editor/widget_hierarchy.cpp
+++ b/code/studio/src/plugins/gui_editor/widget_hierarchy.cpp
@@ -182,6 +182,27 @@ namespace GUIEditor
 		}
 	}
 
+	QTreeWidgetItem* WidgetHierarchy::findItem( const std::string &id )
+	{
+		std::map< std::string, QTreeWidgetItem* >::iterator itr
+			= widgetHierarchyMap.find( id );
+		if( itr == widgetHierarchyMap.end() )
+			return NULL;
+		else
+			return itr->second;
+	}
+
+	QTreeWidgetItem* WidgetHierarchy::findParent( const std::string &id )
+	{
+		// Get the parent's name
+		std::string::size_type p = id.find_last_of( ':' );
+		if( p == std::string::npos )
+			return NULL;
+		std::string parentId = id.substr( 0, p );
+
+		return findItem( parentId );
+	}
+
 	void WidgetHierarchy::onWidgetDeleted( const std::string &id )
 	{
 		std::map< std::string, QTreeWidgetItem* >::iterator itr
@@ -238,6 +259,33 @@ namespace GUIEditor
 
 	void WidgetHierarchy::onWidgetMoved( const std::string &oldid, const std::string &newid )
 	{
+		QTreeWidgetItem *newParent = NULL;
+		QTreeWidgetItem *item = NULL;
+		QString id;
+
+		newParent = findParent( newid );
+		item = findItem( oldid );
+
+		if( ( newParent == NULL ) || ( item == NULL ) )
+			return;
+
+		// Remove old item
+		QTreeWidgetItem *p = item->parent();
+		if( p != NULL )
+			p->setExpanded( false );
+		id = item->data( 0, Qt::DisplayRole ).toString();
+		delete item;
+		item = NULL;
+
+		// Remove reference to old item
+		widgetHierarchyMap.erase( oldid );
+
+		// Add new item
+		item = new QTreeWidgetItem();
+		item->setData( 0, Qt::DisplayRole, id );
+		item->setSelected( true );
+		newParent->addChild( item );
+		newParent->setExpanded( true );
 	}
 
 	void WidgetHierarchy::getCurrentGroup( QString &g )
diff --git a/code/studio/src/plugins/gui_editor/widget_hierarchy.h b/code/studio/src/plugins/gui_editor/widget_hierarchy.h
index e416ec145..3d748e15f 100644
--- a/code/studio/src/plugins/gui_editor/widget_hierarchy.h
+++ b/code/studio/src/plugins/gui_editor/widget_hierarchy.h
@@ -50,6 +50,8 @@ namespace GUIEditor
 
 	private:
 		void buildHierarchy( QTreeWidgetItem *parent, NLGUI::CInterfaceGroup *group );
+		QTreeWidgetItem* findItem( const std::string &id );
+		QTreeWidgetItem* findParent( const std::string &id );
 
 	public Q_SLOTS:
 		void onGUILoaded();