Fixed: style inheritance for underline, strikethrough

--HG-- branch : develop
7 years ago · adc89b3a82
parent b86bf43090
commit adc89b3a82
1 changed files with 6 additions and 5 deletions
--- a/code/nel/src/gui/group_html.cpp
+++ b/code/nel/src/gui/group_html.cpp
@ -6175,6 +6175,12 @@ namespace NLGUI
 	{
 		const CStyleParams current = _Style;

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

 	// ***************************************************************************