Merge with develop
This commit is contained in:
parent
a8e28a20b4
commit
4158e851a9
1 changed files with 17 additions and 6 deletions
|
@ -2274,12 +2274,16 @@ namespace NLGUI
|
|||
case HTML_DD:
|
||||
if (!_DL.empty())
|
||||
{
|
||||
if (_Indent > ULIndent)
|
||||
_Indent = _Indent - ULIndent;
|
||||
else
|
||||
_Indent = 0;
|
||||
// parser will process two DD in a row as nested when first DD is not closed
|
||||
if (_DL.back().DD)
|
||||
{
|
||||
if (_Indent > ULIndent)
|
||||
_Indent = _Indent - ULIndent;
|
||||
else
|
||||
_Indent = 0;
|
||||
|
||||
_DL.back().DD = false;
|
||||
_DL.back().DD = false;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case HTML_SPAN:
|
||||
|
@ -3843,7 +3847,7 @@ namespace NLGUI
|
|||
uint32 w, h;
|
||||
CBitmap::loadSize (image, w, h);
|
||||
if (w == 0 || h == 0 || ((!NLMISC::isPowerOf2(w) || !NLMISC::isPowerOf2(h)) && !NL3D::CTextureFile::supportNonPowerOfTwoTextures()))
|
||||
image.clear();
|
||||
image = "web_del.tga";
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -3988,6 +3992,13 @@ namespace NLGUI
|
|||
normal = "web_del.tga";
|
||||
addImageDownload(normalBitmap, ctrlButton, style);
|
||||
}
|
||||
else
|
||||
{
|
||||
uint32 w, h;
|
||||
CBitmap::loadSize(normal, w, h);
|
||||
if (w == 0 || h == 0)
|
||||
normal = "web_del.tga";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue