Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
Nimetu 2016-01-10 16:34:13 +02:00
commit e44e131365
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2273,6 +2273,9 @@ namespace NLGUI
break; break;
case HTML_DD: case HTML_DD:
if (!_DL.empty()) if (!_DL.empty())
{
// parser will process two DD in a row as nested when first DD is not closed
if (_DL.back().DD)
{ {
if (_Indent > ULIndent) if (_Indent > ULIndent)
_Indent = _Indent - ULIndent; _Indent = _Indent - ULIndent;
@ -2281,6 +2284,7 @@ namespace NLGUI
_DL.back().DD = false; _DL.back().DD = false;
} }
}
break; break;
case HTML_SPAN: case HTML_SPAN:
popIfNotEmpty (_FontSize); popIfNotEmpty (_FontSize);
@ -3843,7 +3847,7 @@ namespace NLGUI
uint32 w, h; uint32 w, h;
CBitmap::loadSize (image, w, h); CBitmap::loadSize (image, w, h);
if (w == 0 || h == 0 || ((!NLMISC::isPowerOf2(w) || !NLMISC::isPowerOf2(h)) && !NL3D::CTextureFile::supportNonPowerOfTwoTextures())) if (w == 0 || h == 0 || ((!NLMISC::isPowerOf2(w) || !NLMISC::isPowerOf2(h)) && !NL3D::CTextureFile::supportNonPowerOfTwoTextures()))
image.clear(); image = "web_del.tga";
} }
else else
{ {
@ -3988,6 +3992,13 @@ namespace NLGUI
normal = "web_del.tga"; normal = "web_del.tga";
addImageDownload(normalBitmap, ctrlButton, style); addImageDownload(normalBitmap, ctrlButton, style);
} }
else
{
uint32 w, h;
CBitmap::loadSize(normal, w, h);
if (w == 0 || h == 0)
normal = "web_del.tga";
}
} }
} }