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

Fixed: Inconsistent html color parsing

Browse source 
--HG--
branch : develop
This commit is contained in:
Nimetu 2016-06-25 17:45:21 +03:00
parent 36a4c6dce7
commit 07a68281a5
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -762,7 +762,7 @@ namespace NLGUI
cellParams = _CellParams.back(); \ cellParams = _CellParams.back(); \
} \ } \
if (present[prefix##_BGCOLOR] && value[prefix##_BGCOLOR]) \ if (present[prefix##_BGCOLOR] && value[prefix##_BGCOLOR]) \
cellParams.BgColor = getColor (value[prefix##_BGCOLOR]); \ scanHTMLColor(value[prefix##_BGCOLOR], cellParams.BgColor); \
if (present[prefix##_L_MARGIN] && value[prefix##_L_MARGIN]) \ if (present[prefix##_L_MARGIN] && value[prefix##_L_MARGIN]) \
fromString(value[prefix##_L_MARGIN], cellParams.LeftMargin); \ fromString(value[prefix##_L_MARGIN], cellParams.LeftMargin); \
if (present[prefix##_NOWRAP]) \ if (present[prefix##_NOWRAP]) \
@ -1237,8 +1237,9 @@ namespace NLGUI
{ {
if (present[HTML_BODY_BGCOLOR] && value[HTML_BODY_BGCOLOR]) if (present[HTML_BODY_BGCOLOR] && value[HTML_BODY_BGCOLOR])
{ {
CRGBA bgColor = getColor (value[HTML_BODY_BGCOLOR]); CRGBA bgColor;
setBackgroundColor (bgColor); if (scanHTMLColor(value[HTML_BODY_BGCOLOR], bgColor))
setBackgroundColor (bgColor);
} }
string style; string style;
@ -1777,7 +1778,7 @@ namespace NLGUI
if (present[MY_HTML_TABLE_BORDER] && value[MY_HTML_TABLE_BORDER]) if (present[MY_HTML_TABLE_BORDER] && value[MY_HTML_TABLE_BORDER])
fromString(value[MY_HTML_TABLE_BORDER], table->Border); fromString(value[MY_HTML_TABLE_BORDER], table->Border);
if (present[MY_HTML_TABLE_BORDERCOLOR] && value[MY_HTML_TABLE_BORDERCOLOR]) if (present[MY_HTML_TABLE_BORDERCOLOR] && value[MY_HTML_TABLE_BORDERCOLOR])
table->BorderColor = getColor (value[MY_HTML_TABLE_BORDERCOLOR]); scanHTMLColor(value[MY_HTML_TABLE_BORDERCOLOR], table->BorderColor);
if (present[MY_HTML_TABLE_CELLSPACING] && value[MY_HTML_TABLE_CELLSPACING]) if (present[MY_HTML_TABLE_CELLSPACING] && value[MY_HTML_TABLE_CELLSPACING])
fromString(value[MY_HTML_TABLE_CELLSPACING], table->CellSpacing); fromString(value[MY_HTML_TABLE_CELLSPACING], table->CellSpacing);
if (present[MY_HTML_TABLE_CELLPADDING] && value[MY_HTML_TABLE_CELLPADDING]) if (present[MY_HTML_TABLE_CELLPADDING] && value[MY_HTML_TABLE_CELLPADDING])