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

Fixed: style inheritance for underline, strikethrough

Browse source 
--HG--
branch : develop
This commit is contained in:
Nimetu 2018-08-18 09:16:14 +03:00
parent b86bf43090
commit adc89b3a82
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6175,6 +6175,12 @@ namespace NLGUI
{ {
const CStyleParams current = _Style; const CStyleParams current = _Style;
if (inherit)
{
style.Underlined = current.Underlined;
style.StrikeThrough = current.StrikeThrough;
}
float tmpf; float tmpf;
TStyle styles = parseStyle(styleString); TStyle styles = parseStyle(styleString);
TStyle::iterator it; TStyle::iterator it;
@ -6396,11 +6402,6 @@ namespace NLGUI
style.GlobalColor = b; style.GlobalColor = b;
} }
} }
if (inherit)
{
style.Underlined = current.Underlined || style.Underlined;
style.StrikeThrough = current.StrikeThrough || style.StrikeThrough;
}
} }
// *************************************************************************** // ***************************************************************************