aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-27 09:36:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed: DL list top margin

Browse source 
--HG--
branch : develop
This commit is contained in:
Nimetu 2016-01-05 23:23:19 +02:00
parent f95d445839
commit 6bcb153930
1 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1924,7 +1924,7 @@ namespace NLGUI
else else
_UL.push_back(HTMLOListElement(1, "square")); _UL.push_back(HTMLOListElement(1, "square"));
// if LI is already present // if LI is already present
_LI = _UL.size() > 1; _LI = _UL.size() > 1 || getDL();
_Indent += ULIndent; _Indent += ULIndent;
endParagraph(); endParagraph();
break; break;
@ -1986,19 +1986,28 @@ namespace NLGUI
break; break;
case HTML_DL: case HTML_DL:
_DL.push_back(true); _DL.push_back(true);
_LI = _DL.size() > 1 || !_UL.empty();
endParagraph(); endParagraph();
break; break;
case HTML_DT: case HTML_DT:
if (getDL()) if (getDL())
{ {
newParagraph(0);
// see if this is the first <dt>, closing tag not required // see if this is the first <dt>, closing tag not required
if (!_DT) if (!_DT)
{ {
_DT = true; _DT = true;
_FontWeight.push_back(FONT_WEIGHT_BOLD); _FontWeight.push_back(FONT_WEIGHT_BOLD);
} }
if (!_LI)
{
_LI = true;
newParagraph(ULBeginSpace);
}
else
{
newParagraph(LIBeginSpace);
}
} }
break; break;
case HTML_DD: case HTML_DD:
@ -2012,7 +2021,15 @@ namespace NLGUI
} }
_Indent += ULIndent; _Indent += ULIndent;
newParagraph(0); if (!_LI)
{
_LI = true;
newParagraph(ULBeginSpace);
}
else
{
newParagraph(LIBeginSpace);
}
} }
break; break;
case HTML_OL: case HTML_OL:
@ -2027,7 +2044,7 @@ namespace NLGUI
_UL.push_back(HTMLOListElement(start, type)); _UL.push_back(HTMLOListElement(start, type));
// if LI is already present // if LI is already present
_LI = _UL.size() > 1; _LI = _UL.size() > 1 || getDL();
_Indent += ULIndent; _Indent += ULIndent;
endParagraph(); endParagraph();
} }