Add -ryzom-modulate-text-color to separate text from background, #644

ryzom · Sep 18, 2021 · 028f6cd · 028f6cd
1 parent 3f39918
commit 028f6cd
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/nel/include/nel/gui/css_style.h b/nel/include/nel/gui/css_style.h
@@ -63,6 +63,7 @@ namespace NLGUI
 			Underlined=false;
 			StrikeThrough=false;
 			GlobalColor=false;
+			GlobalColorText=false;
 			DisplayBlock=false;
 			Width=-1;
 			Height=-1;
@@ -93,6 +94,7 @@ namespace NLGUI
 		NLMISC::CRGBA TextColor;
 		STextShadow TextShadow;
 		bool GlobalColor;
+		bool GlobalColorText;
 		bool Underlined;
 		bool StrikeThrough;
 		bool DisplayBlock;
@@ -215,6 +217,7 @@ namespace NLGUI
 			_StyleStack.push_back(Current);
 
 			Current.GlobalColor = false;
+			// inherit GlobalColorText
 			Current.DisplayBlock = false;
 			Current.Width=-1;
 			Current.Height=-1;

diff --git a/nel/src/gui/css_style.cpp b/nel/src/gui/css_style.cpp
@@ -936,6 +936,16 @@ namespace NLGUI
 					style.GlobalColor = b;
 			}
 			else
+			if (it->first == "-ryzom-modulate-text-color")
+			{
+				bool b;
+				if (it->second == "inherit")
+					style.GlobalColorText = current.GlobalColorText;
+				else
+				if (fromString(it->second, b))
+					style.GlobalColorText = b;
+			}
+			else
 			if (it->first == "background-color")
 			{
 				if (it->second == "inherit")

diff --git a/nel/src/gui/group_html.cpp b/nel/src/gui/group_html.cpp
@@ -2551,7 +2551,7 @@ namespace NLGUI
 			(embolden == text->getEmbolden()) &&
 			(style.FontOblique == text->getOblique()) &&
 			(getLink() == text->Link) &&
-			(style.GlobalColor == text->getModulateGlobalColor());
+			(style.GlobalColorText == text->getModulateGlobalColor());
 	}
 
 	// ***************************************************************************
@@ -2588,7 +2588,10 @@ namespace NLGUI
 			nlinfo("Text button template '%s' is missing :button or :b text element", tpl.c_str());
 			return;
 		}
-		ctrlButton->setModulateGlobalColorAll(false);
+		ctrlButton->setModulateGlobalColorAll(_Style.Current.GlobalColor);
+		ctrlButton->setTextModulateGlobalColorNormal(_Style.Current.GlobalColorText);
+		ctrlButton->setTextModulateGlobalColorOver(_Style.Current.GlobalColorText);
+		ctrlButton->setTextModulateGlobalColorPushed(_Style.Current.GlobalColorText);
 
 		// Translate the tooltip
 		ctrlButton->setText(text);
@@ -2619,7 +2622,7 @@ namespace NLGUI
 		newLink->setText(text);
 		newLink->setMultiLineSpace((uint)((float)(_Style.Current.FontSize)*LineSpaceFontFactor));
 		newLink->setMultiLine(true);
-		newLink->setModulateGlobalColor(_Style.Current.GlobalColor);
+		newLink->setModulateGlobalColor(_Style.Current.GlobalColorText);
 		setTextStyle(newLink, _Style.Current);
 
 		registerAnchor(newLink);
@@ -5247,6 +5250,9 @@ namespace NLGUI
 			if (ctrlButton)
 			{
 				ctrlButton->setModulateGlobalColorAll (_Style.Current.GlobalColor);
+				ctrlButton->setTextModulateGlobalColorNormal(_Style.Current.GlobalColorText);
+				ctrlButton->setTextModulateGlobalColorOver(_Style.Current.GlobalColorText);
+				ctrlButton->setTextModulateGlobalColorPushed(_Style.Current.GlobalColorText);
 
 				// Translate the tooltip
 				if (!tooltip.empty())