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

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
Nimetu 2016-07-25 19:27:04 +03:00
commit 869e8572cf
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1924,8 +1924,8 @@ namespace NLGUI
style.Underlined = getFontUnderlined(); style.Underlined = getFontUnderlined();
style.StrikeThrough = getFontStrikeThrough(); style.StrikeThrough = getFontStrikeThrough();
if (present[MY_HTML_SPAN_STYLE] && value[MY_HTML_SPAN_STYLE]) if (present[HTML_PRE_STYLE] && value[HTML_PRE_STYLE])
getStyleParams(value[MY_HTML_SPAN_STYLE], style); getStyleParams(value[HTML_PRE_STYLE], style);
_TextColor.push_back(style.TextColor); _TextColor.push_back(style.TextColor);
_FontFamily.push_back(style.FontFamily); _FontFamily.push_back(style.FontFamily);