From 8066656c09ce86f594944aff389065e61a96bd8a Mon Sep 17 00:00:00 2001
From: dfighter1985 <dfighter1985@localhost>
Date: Wed, 15 Oct 2014 19:46:43 +0200
Subject: [PATCH] Fix parent pos and size parsing.

---
 code/nel/include/nel/gui/interface_element.h |  2 +
 code/nel/src/gui/interface_element.cpp       | 44 +++++++++++++++++++-
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/code/nel/include/nel/gui/interface_element.h b/code/nel/include/nel/gui/interface_element.h
index 0f9b271ce..c1f6d20e7 100644
--- a/code/nel/include/nel/gui/interface_element.h
+++ b/code/nel/include/nel/gui/interface_element.h
@@ -491,8 +491,10 @@ namespace NLGUI
 		void setEditorSelected( bool b ){ editorSelected = b; }
 		bool isEditorSelected() const{ return editorSelected; }
 
+		void parsePosParent( const std::string &id );
 		void setPosParent( const std::string &id );
 		void getPosParent( std::string &id ) const;
+		void parseSizeParent( const std::string &id );
 		void setSizeParent( const std::string &id );
 		void getSizeParent( std::string &id ) const;
 		
diff --git a/code/nel/src/gui/interface_element.cpp b/code/nel/src/gui/interface_element.cpp
index 620e7dbdb..66eee038e 100644
--- a/code/nel/src/gui/interface_element.cpp
+++ b/code/nel/src/gui/interface_element.cpp
@@ -388,13 +388,13 @@ namespace NLGUI
 		ptr = (char*) xmlGetProp( cur, (xmlChar*)"posparent" );
 		if (ptr)
 		{
-			setPosParent( std::string( (const char*)ptr ) );
+			parsePosParent( (const char*)ptr );
 		}
 
 		ptr = (char*) xmlGetProp( cur, (xmlChar*)"sizeparent" );
 		if (ptr)
 		{
-			setSizeParent( std::string( (const char*)ptr ) );
+			parseSizeParent( (const char*)ptr );
 		}
 
 		ptr = (char*) xmlGetProp (cur, (xmlChar*)"sizeref");
@@ -1532,6 +1532,26 @@ namespace NLGUI
 		return false;
 	}
 
+	void CInterfaceElement::parsePosParent( const std::string &id )
+	{
+		CInterfaceElement *p = getParent();
+
+		if( ( id == "parent" ) || ( id.empty() ) )
+		{
+			setParentPos( p );
+			return;
+		}
+
+		std::string ppId;
+
+		if( p != NULL )
+			ppId = p->getId() + ":" + id;
+		else
+			ppId = std::string( "ui:" ) + id;
+
+		CWidgetManager::getInstance()->getParser()->addParentPositionAssociation( this, ppId );
+	}
+
 	void CInterfaceElement::setPosParent( const std::string &id )
 	{
 		// Parent or empty id simply means the group parent
@@ -1596,6 +1616,26 @@ namespace NLGUI
 		id = p->getId();
 	}
 
+	void CInterfaceElement::parseSizeParent( const std::string &id )
+	{
+		CInterfaceElement *p = getParent();
+
+		if( ( id == "parent" ) || ( id.empty() ) )
+		{
+			setParentSize( p );
+			return;
+		}
+
+		std::string spId;
+
+		if( p != NULL )
+			spId = p->getId() + ":" + id;
+		else
+			spId = std::string( "ui:" ) + id;
+
+		CWidgetManager::getInstance()->getParser()->addParentSizeAssociation( this, spId );
+	}
+
 	void CInterfaceElement::setSizeParent( const std::string &id )
 	{
 		// Parent or empty id simply means the group parent