|
|
@ -2274,12 +2274,16 @@ namespace NLGUI
|
|
|
|
case HTML_DD:
|
|
|
|
case HTML_DD:
|
|
|
|
if (!_DL.empty())
|
|
|
|
if (!_DL.empty())
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (_Indent > ULIndent)
|
|
|
|
// parser will process two DD in a row as nested when first DD is not closed
|
|
|
|
_Indent = _Indent - ULIndent;
|
|
|
|
if (_DL.back().DD)
|
|
|
|
else
|
|
|
|
{
|
|
|
|
_Indent = 0;
|
|
|
|
if (_Indent > ULIndent)
|
|
|
|
|
|
|
|
_Indent = _Indent - ULIndent;
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
_Indent = 0;
|
|
|
|
|
|
|
|
|
|
|
|
_DL.back().DD = false;
|
|
|
|
_DL.back().DD = false;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case HTML_SPAN:
|
|
|
|
case HTML_SPAN:
|
|
|
@ -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";
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|