aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-09-20 03:30:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed: Render p and div as block level elements

Browse source 
--HG--
branch : develop
This commit is contained in:
Nimetu 2015-12-19 20:39:40 +02:00
parent 73d010ca6b
commit 5e61995c3c
2 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
code/nel/include/nel/gui/group_html.h
View file

@ -572,7 +572,15 @@ namespace NLGUI
return ""; return "";
return _LinkClass.back().c_str(); 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) // Divs (i.e. interface group)
std::vector<class CInterfaceGroup*> _Divs; std::vector<class CInterfaceGroup*> _Divs;
inline CInterfaceGroup *getDiv() const inline CInterfaceGroup *getDiv() const

16
code/nel/src/gui/group_html.cpp
View file

@ -1145,6 +1145,7 @@ namespace NLGUI
case HTML_DIV: case HTML_DIV:
{ {
_BlockLevelElement.push_back(true);
registerAnchorName(MY_HTML_DIV); registerAnchorName(MY_HTML_DIV);
if (present[MY_HTML_DIV_NAME] && value[MY_HTML_DIV_NAME]) if (present[MY_HTML_DIV_NAME] && value[MY_HTML_DIV_NAME])
@ -1204,6 +1205,8 @@ namespace NLGUI
inst->setPosRef(Hotspot_TL); inst->setPosRef(Hotspot_TL);
inst->setParentPosRef(Hotspot_TL); inst->setParentPosRef(Hotspot_TL);
getDiv()->addGroup(inst); getDiv()->addGroup(inst);
_BlockLevelElement.back() = false;
} }
else else
{ {
@ -1220,6 +1223,11 @@ namespace NLGUI
} }
} }
} }
if (isBlockLevelElement())
{
newParagraph(0);
}
} }
break; break;
@ -2118,12 +2126,20 @@ namespace NLGUI
popIfNotEmpty (_GlobalColor); popIfNotEmpty (_GlobalColor);
endParagraph(); endParagraph();
break; break;
case HTML_P:
endParagraph();
break;
case HTML_PRE: case HTML_PRE:
popIfNotEmpty (_PRE); popIfNotEmpty (_PRE);
break; break;
case HTML_DIV: case HTML_DIV:
if (isBlockLevelElement())
{
endParagraph();
}
_DivName = ""; _DivName = "";
popIfNotEmpty (_Divs); popIfNotEmpty (_Divs);
popIfNotEmpty (_BlockLevelElement);
break; break;
case HTML_TABLE: case HTML_TABLE: