From a7ec7dfcbb991a2dfbaaa2b37753659dcd6b9ca3 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sat, 19 Dec 2015 20:39:40 +0200
Subject: [PATCH] Changed: Render p and div as block level elements

---
 code/nel/include/nel/gui/group_html.h | 10 +++++++++-
 code/nel/src/gui/group_html.cpp       | 16 ++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/code/nel/include/nel/gui/group_html.h b/code/nel/include/nel/gui/group_html.h
index ae21ad9c6..fb2f5b372 100644
--- a/code/nel/include/nel/gui/group_html.h
+++ b/code/nel/include/nel/gui/group_html.h
@@ -572,7 +572,15 @@ namespace NLGUI
 				return "";
 			return _LinkClass.back().c_str();
 		}
-		
+
+		std::vector<bool>				_BlockLevelElement;
+		inline const bool isBlockLevelElement() const
+		{
+			if (_BlockLevelElement.empty())
+				return false;
+			return _BlockLevelElement.back();
+		}
+
 		// Divs (i.e. interface group)
 		std::vector<class CInterfaceGroup*>	_Divs;
 		inline CInterfaceGroup *getDiv() const
diff --git a/code/nel/src/gui/group_html.cpp b/code/nel/src/gui/group_html.cpp
index 8d43dbc02..8ca74d6a4 100644
--- a/code/nel/src/gui/group_html.cpp
+++ b/code/nel/src/gui/group_html.cpp
@@ -1145,6 +1145,7 @@ namespace NLGUI
 
 			case HTML_DIV:
 			{
+				_BlockLevelElement.push_back(true);
 				registerAnchorName(MY_HTML_DIV);
 
 				if (present[MY_HTML_DIV_NAME] && value[MY_HTML_DIV_NAME])
@@ -1204,6 +1205,8 @@ namespace NLGUI
 									inst->setPosRef(Hotspot_TL);
 									inst->setParentPosRef(Hotspot_TL);
 									getDiv()->addGroup(inst);
+
+									_BlockLevelElement.back() = false;
 							}
 							else
 							{
@@ -1220,6 +1223,11 @@ namespace NLGUI
 						}
 					}
 				}
+
+				if (isBlockLevelElement())
+				{
+					newParagraph(0);
+				}
 			}
 				break;
 
@@ -2118,12 +2126,20 @@ namespace NLGUI
 				popIfNotEmpty (_GlobalColor);
 				endParagraph();
 				break;
+			case HTML_P:
+				endParagraph();
+				break;
 			case HTML_PRE:
 				popIfNotEmpty (_PRE);
 				break;
 			case HTML_DIV:
+				if (isBlockLevelElement())
+				{
+					endParagraph();
+				}
 				_DivName = "";
 				popIfNotEmpty (_Divs);
+				popIfNotEmpty (_BlockLevelElement);
 				break;
 
 			case HTML_TABLE: