|
|
@ -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;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// ***************************************************************************
|
|
|
|
// ***************************************************************************
|
|
|
|