Added basic support for properties inheritance in CSS.

SpartanJ · SpartanJ · commit 6e7180b0dce7 · 2026-03-17T21:33:37.000-03:00
Added support for "style" property in widgets.
Fixed a crash in Text when trying to render a shadow from an outlined text.
diff --git a/include/eepp/ui/css/propertydefinition.hpp b/include/eepp/ui/css/propertydefinition.hpp
@@ -280,7 +280,7 @@ class EE_API PropertyDefinition {
 
 	const std::string& getDefaultValue() const;
 
-	bool getInherited() const;
+	bool isInherited() const;
 
 	const PropertyRelativeTarget& getRelativeTarget() const;
 
diff --git a/include/eepp/ui/css/propertyspecification.hpp b/include/eepp/ui/css/propertyspecification.hpp
@@ -31,11 +31,14 @@ class EE_API PropertySpecification {
 
 	bool isShorthand( const Uint32& id ) const;
 
+	const SmallVector<PropertyId>& getInheritableProperties() const;
+
   protected:
 	friend class PropertyDefinition;
 
 	std::unordered_map<Uint32, std::shared_ptr<PropertyDefinition>> mProperties;
 	std::unordered_map<Uint32, std::shared_ptr<ShorthandDefinition>> mShorthands;
+	SmallVector<PropertyId> mInheritableProperties;
 
 	const PropertyDefinition* addPropertyAlias( Uint32 aliasId, const PropertyDefinition* propDef );
 };
diff --git a/include/eepp/ui/css/stylesheetpropertiesparser.hpp b/include/eepp/ui/css/stylesheetpropertiesparser.hpp
@@ -9,11 +9,11 @@ namespace EE { namespace UI { namespace CSS {
 
 class EE_API StyleSheetPropertiesParser {
   public:
-	StyleSheetPropertiesParser();
+	StyleSheetPropertiesParser() = default;
 
-	explicit StyleSheetPropertiesParser( const std::string& propsstr );
+	explicit StyleSheetPropertiesParser( std::string_view propsstr );
 
-	void parse( const std::string& propsstr );
+	void parse( std::string_view propsstr );
 
 	void print();
 
@@ -24,18 +24,18 @@ class EE_API StyleSheetPropertiesParser {
   protected:
 	enum ReadState { ReadingPropertyName, ReadingPropertyValue, ReadingComment };
 
-	ReadState mPrevRs;
+	ReadState mPrevRs{ ReadingPropertyName };
 
 	StyleSheetProperties mProperties;
 	StyleSheetVariables mVariables;
 
 	int readPropertyName( ReadState& rs, std::size_t pos, std::string& buffer,
-						  const std::string& str );
+						  std::string_view str );
 
 	int readPropertyValue( ReadState& rs, std::size_t pos, std::string& buffer,
-						   const std::string& str );
+						   std::string_view str );
 
-	int readComment( ReadState& rs, std::size_t pos, std::string& buffer, const std::string& str );
+	int readComment( ReadState& rs, std::size_t pos, std::string& buffer, std::string_view str );
 
 	void addProperty( std::string name, std::string value );
 };
diff --git a/include/eepp/ui/css/stylesheetspecification.hpp b/include/eepp/ui/css/stylesheetspecification.hpp
@@ -5,6 +5,7 @@
 #include <eepp/system/functionstring.hpp>
 #include <eepp/system/singleton.hpp>
 #include <eepp/ui/css/drawableimageparser.hpp>
+#include <eepp/ui/css/propertydefinition.hpp>
 #include <eepp/ui/css/shorthanddefinition.hpp>
 #include <functional>
 
@@ -43,6 +44,8 @@ class EE_API StyleSheetSpecification {
 
 	const PropertyDefinition* getProperty( const std::string& name ) const;
 
+	const SmallVector<CSS::PropertyId>& getInheritableProperties() const;
+
 	ShorthandDefinition& registerShorthand( const std::string& name,
 											const std::vector<std::string>& properties,
 											const std::string& shorthandFuncName );
diff --git a/include/eepp/ui/uistyle.hpp b/include/eepp/ui/uistyle.hpp
@@ -73,6 +73,10 @@ class EE_API UIStyle : public UIState {
 
 	bool hasProperty( const CSS::PropertyId& propertyId ) const;
 
+	bool hasLocalProperty( CSS::PropertyId propId ) const;
+
+	CSS::StyleSheetProperty* getInheritedProperty( CSS::PropertyId propId ) const;
+
 	void resetGlobalDefinition();
 
 	void resetCachedProperties();
@@ -122,6 +126,8 @@ class EE_API UIStyle : public UIState {
 	void applyStyleSheetProperty( const CSS::StyleSheetProperty& property,
 								  std::shared_ptr<CSS::ElementDefinition> prevDefinition );
 
+	void applyInheritedProperties();
+
 	void updateAnimationsPlayState();
 
 	void updateAnimations();
diff --git a/include/eepp/ui/uitextspan.hpp b/include/eepp/ui/uitextspan.hpp
@@ -6,6 +6,8 @@
 
 namespace EE { namespace UI {
 
+using SpanHitBoxes = SmallVector<Rectf, 4>;
+
 class EE_API UITextSpan : public UIWidget {
   public:
 	static UITextSpan* New();
@@ -115,19 +117,19 @@ class EE_API UITextSpan : public UIWidget {
 	bool hasFontShadowOffset() const;
 	bool hasFontBackgroundColor() const;
 
-	std::vector<Rectf>& getHitBoxes();
+	SpanHitBoxes& getHitBoxes();
 
-	const std::vector<Rectf>& getHitBoxes() const;
+	const SpanHitBoxes& getHitBoxes() const;
 
-	void setHitBoxes( std::vector<Rectf>&& hitBoxes );
+	void setHitBoxes( SpanHitBoxes&& hitBoxes );
 
 	virtual Node* overFind( const Vector2f& point );
 
   protected:
 	Uint32 mStyleState{ StyleStateNone };
 	String mText;
 	UIFontStyleConfig mFontStyleConfig;
-	std::vector<Rectf> mHitBoxes;
+	SpanHitBoxes mHitBoxes;
 
 	explicit UITextSpan( const std::string& tag = "span" );
 
diff --git a/include/eepp/ui/uiwidget.hpp b/include/eepp/ui/uiwidget.hpp
@@ -543,6 +543,8 @@ class EE_API UIWidget : public UINode {
 	 */
 	virtual bool applyProperty( const StyleSheetProperty& attribute );
 
+	void propagateInheritedProperty( const CSS::StyleSheetProperty& property );
+
 	/**
 	 * @brief Gets the padding in density-independent pixels (dp).
 	 *
diff --git a/src/eepp/graphics/text.cpp b/src/eepp/graphics/text.cpp
@@ -1760,12 +1760,15 @@ void Text::draw( const Float& X, const Float& Y, const Vector2f& scale, const Fl
 	if ( mFontStyleConfig.Style & Shadow ) {
 		std::vector<Color> colors;
 		Color shadowColor( getShadowColor() );
-		if ( getFillColor().a != 255 )
+		if ( getFillColor().a != 255 ) {
 			shadowColor.a =
 				(Uint8)( (Float)shadowColor.a * ( (Float)getFillColor().a / (Float)255 ) );
+		}
 		colors.assign( mColors.size(), shadowColor );
 		draw( X + mFontStyleConfig.ShadowOffset.x, Y + mFontStyleConfig.ShadowOffset.y, scale,
-			  rotation, effect, rotationCenter, scaleCenter, colors, {}, Color::Transparent );
+			  rotation, effect, rotationCenter, scaleCenter, colors,
+			  mFontStyleConfig.OutlineThickness > 0 ? mOutlineColors : std::vector<Color>{},
+			  Color::Transparent );
 	}
 
 	draw( X, Y, scale, rotation, effect, rotationCenter, scaleCenter, mColors, mOutlineColors,
diff --git a/src/eepp/ui/css/propertydefinition.cpp b/src/eepp/ui/css/propertydefinition.cpp
@@ -30,7 +30,7 @@ const std::string& PropertyDefinition::getDefaultValue() const {
 	return mDefaultValue;
 }
 
-bool PropertyDefinition::getInherited() const {
+bool PropertyDefinition::isInherited() const {
 	return mInherited;
 }
 
diff --git a/src/eepp/ui/css/propertyspecification.cpp b/src/eepp/ui/css/propertyspecification.cpp
@@ -22,7 +22,10 @@ PropertyDefinition& PropertySpecification::registerProperty( const std::string&
 
 	mProperties[propDef->getId()] = std::shared_ptr<PropertyDefinition>( propDef );
 
-	for ( auto& sep : {"-", "_"} ) {
+	if ( inherited )
+		mInheritableProperties.push_back( propDef->getPropertyId() );
+
+	for ( auto& sep : { "-", "_" } ) {
 		if ( propDef->getName().find( sep ) != std::string::npos ) {
 			std::string alias( propDef->getName() );
 			String::replaceAll( alias, sep, "" );
@@ -33,6 +36,10 @@ PropertyDefinition& PropertySpecification::registerProperty( const std::string&
 	return *propDef;
 }
 
+const SmallVector<PropertyId>& PropertySpecification::getInheritableProperties() const {
+	return mInheritableProperties;
+}
+
 const PropertyDefinition* PropertySpecification::getProperty( const Uint32& id ) const {
 	auto it = mProperties.find( id );
 
diff --git a/src/eepp/ui/css/stylesheetpropertiesparser.cpp b/src/eepp/ui/css/stylesheetpropertiesparser.cpp
@@ -6,15 +6,8 @@ using namespace EE::UI;
 
 namespace EE { namespace UI { namespace CSS {
 
-StyleSheetPropertiesParser::StyleSheetPropertiesParser() : mPrevRs( ReadingPropertyName ) {}
-
-StyleSheetPropertiesParser::StyleSheetPropertiesParser( const std::string& propsstr ) :
-	mPrevRs( ReadingPropertyName ) {
-	std::vector<std::string> props = String::split( propsstr, ';' );
-
-	if ( !props.empty() ) {
-		parse( propsstr );
-	}
+StyleSheetPropertiesParser::StyleSheetPropertiesParser( std::string_view propsstr ) {
+	parse( propsstr );
 }
 
 const StyleSheetProperties& StyleSheetPropertiesParser::getProperties() const {
@@ -25,7 +18,7 @@ const StyleSheetVariables& StyleSheetPropertiesParser::getVariables() const {
 	return mVariables;
 }
 
-void StyleSheetPropertiesParser::parse( const std::string& propsstr ) {
+void StyleSheetPropertiesParser::parse( std::string_view propsstr ) {
 	mProperties.clear();
 	mVariables.clear();
 	ReadState rs = ReadingPropertyName;
@@ -54,7 +47,7 @@ void StyleSheetPropertiesParser::parse( const std::string& propsstr ) {
 
 int StyleSheetPropertiesParser::readPropertyName( StyleSheetPropertiesParser::ReadState& rs,
 												  std::size_t pos, std::string& buffer,
-												  const std::string& str ) {
+												  std::string_view str ) {
 	mPrevRs = rs;
 	buffer.clear();
 
@@ -80,7 +73,7 @@ int StyleSheetPropertiesParser::readPropertyName( StyleSheetPropertiesParser::Re
 
 int StyleSheetPropertiesParser::readPropertyValue( StyleSheetPropertiesParser::ReadState& rs,
 												   std::size_t pos, std::string& buffer,
-												   const std::string& str ) {
+												   std::string_view str ) {
 	std::string propName( buffer );
 
 	buffer.clear();
@@ -128,7 +121,7 @@ int StyleSheetPropertiesParser::readPropertyValue( StyleSheetPropertiesParser::R
 
 int StyleSheetPropertiesParser::readComment( StyleSheetPropertiesParser::ReadState& rs,
 											 std::size_t pos, std::string& buffer,
-											 const std::string& str ) {
+											 std::string_view str ) {
 	buffer.clear();
 
 	while ( pos < str.size() ) {
diff --git a/src/eepp/ui/css/stylesheetspecification.cpp b/src/eepp/ui/css/stylesheetspecification.cpp
@@ -32,6 +32,10 @@ const PropertyDefinition* StyleSheetSpecification::getProperty( const std::strin
 	return mPropertySpecification->getProperty( name );
 }
 
+const SmallVector<PropertyId>& StyleSheetSpecification::getInheritableProperties() const {
+	return mPropertySpecification->getInheritableProperties();
+}
+
 ShorthandDefinition&
 StyleSheetSpecification::registerShorthand( const std::string& name,
 											const std::vector<std::string>& properties,
@@ -195,30 +199,34 @@ void StyleSheetSpecification::registerDefaultProperties() {
 	registerProperty( "opacity", "" ).setType( PropertyType::NumberFloat );
 	registerProperty( "cursor", "arrow" );
 	registerProperty( "text", "" ).setType( PropertyType::String );
-	registerProperty( "text-transform", "" ).setType( PropertyType::String );
-	registerProperty( "color", "" )
+	registerProperty( "text-transform", "", true ).setType( PropertyType::String );
+	registerProperty( "color", "", true )
 		.setType( PropertyType::Color )
 		.addAlias( "text-color" )
 		.addAlias( "textcolor" );
-	registerProperty( "text-shadow-color", "" ).setType( PropertyType::Color );
-	registerProperty( "text-shadow-offset", "" ).setType( PropertyType::Vector2 );
+	registerProperty( "text-shadow-color", "", true ).setType( PropertyType::Color );
+	registerProperty( "text-shadow-offset", "", true ).setType( PropertyType::Vector2 );
 	registerProperty( "selection-color", "" ).setType( PropertyType::Color );
 	registerProperty( "selection-back-color", "" ).setType( PropertyType::Color );
-	registerProperty( "font-family", "" ).addAlias( "font-name" ).setType( PropertyType::String );
-	registerProperty( "font-size", "" )
+	registerProperty( "font-family", "", true )
+		.addAlias( "font-name" )
+		.setType( PropertyType::String );
+	registerProperty( "font-size", "", true )
 		.setType( PropertyType::NumberLength )
 		.addAlias( "text-size" )
 		.addAlias( "textsize" );
-	registerProperty( "font-style", "" ).addAlias( "text-style" ).addAlias( "text-decoration" );
-	registerProperty( "line-spacing", "" ).setType( PropertyType::NumberLength );
-	registerProperty( "text-stroke-width", "" )
+	registerProperty( "font-style", "", true )
+		.addAlias( "text-style" )
+		.addAlias( "text-decoration" );
+	registerProperty( "line-spacing", "", true ).setType( PropertyType::NumberLength );
+	registerProperty( "text-stroke-width", "", true )
 		.setType( PropertyType::NumberLength )
 		.addAlias( "fontoutlinethickness" );
-	registerProperty( "text-stroke-color", "" )
+	registerProperty( "text-stroke-color", "", true )
 		.setType( PropertyType::Color )
 		.addAlias( "fontoutlinecolor" );
-	registerProperty( "text-selection", "" ).setType( PropertyType::Bool );
-	registerProperty( "text-align", "" ).addAlias( "align" );
+	registerProperty( "text-selection", "", true ).setType( PropertyType::Bool );
+	registerProperty( "text-align", "", true ).addAlias( "align" );
 	registerProperty( "icon", "" );
 	registerProperty( "min-icon-size", "" ).setType( PropertyType::Vector2 );
 	registerProperty( "src", "" ).setType( PropertyType::String );
diff --git a/src/eepp/ui/uirichtext.cpp b/src/eepp/ui/uirichtext.cpp
@@ -451,14 +451,14 @@ void UIRichText::rebuildRichText() {
 
 	auto processWidget = [&]( UIWidget* widget, auto& processWidgetRef ) -> void {
 		if ( widget->isType( UI_TYPE_TEXTSPAN ) ) {
-			UITextSpan* span = static_cast<UITextSpan*>( widget );
+			UITextSpan* span = widget->asType<UITextSpan>();
 			if ( !span->getText().empty() ) {
 				mRichText.addSpan( span->getText(), span->getFontStyleConfig() );
 			}
 			Node* spanChild = span->getFirstChild();
 			while ( spanChild != NULL ) {
 				if ( spanChild->isWidget() ) {
-					processWidgetRef( static_cast<UIWidget*>( spanChild ), processWidgetRef );
+					processWidgetRef( spanChild->asType<UIWidget>(), processWidgetRef );
 				}
 				spanChild = spanChild->getNextNode();
 			}
@@ -475,7 +475,7 @@ void UIRichText::rebuildRichText() {
 	Node* child = mChild;
 	while ( NULL != child ) {
 		if ( child->isWidget() ) {
-			processWidget( static_cast<UIWidget*>( child ), processWidget );
+			processWidget( child->asType<UIWidget>(), processWidget );
 		}
 		child = child->getNextNode();
 	}
@@ -489,7 +489,7 @@ void UIRichText::positionChildren() {
 	size_t currentSpan = 0;
 
 	// Helper to find the next RenderSpan of type CustomSize
-	auto getNextCustomSpan = [&]() -> const Graphics::RichText::RenderSpan* {
+	auto getNextCustomSpan = [&]() -> const RichText::RenderSpan* {
 		while ( currentLine < lines.size() ) {
 			const auto& line = lines[currentLine];
 			while ( currentSpan < line.spans.size() ) {
@@ -511,23 +511,23 @@ void UIRichText::positionChildren() {
 		constexpr Float lowF = std::numeric_limits<Float>::lowest();
 		Rectf bounds( maxF, maxF, lowF, lowF );
 
-		Vector2f offset( 0, 0 );
+		Vector2f offset;
 		Node* p = widget->getParent();
 		while ( p && p != this ) {
 			offset += p->isWidget() ? p->asType<UIWidget>()->getPixelsPosition() : p->getPosition();
 			p = p->getParent();
 		}
 
 		if ( widget->isType( UI_TYPE_TEXTSPAN ) ) {
-			UITextSpan* textSpan = static_cast<UITextSpan*>( widget );
+			UITextSpan* textSpan = widget->asType<UITextSpan>();
 			Int64 startChar = curCharIdx;
 			Int64 endChar = curCharIdx;
 			if ( !textSpan->getText().empty() ) {
 				endChar += textSpan->getText().length();
 				curCharIdx = endChar;
 			}
 
-			std::vector<Rectf>& hitBoxes = textSpan->getHitBoxes();
+			auto& hitBoxes = textSpan->getHitBoxes();
 			hitBoxes.clear();
 
 			if ( startChar < endChar ) {
@@ -557,7 +557,7 @@ void UIRichText::positionChildren() {
 			while ( spanChild != NULL ) {
 				if ( spanChild->isWidget() ) {
 					bounds.expand(
-						processWidgetRef( static_cast<UIWidget*>( spanChild ), processWidgetRef ) );
+						processWidgetRef( spanChild->asType<UIWidget>(), processWidgetRef ) );
 				}
 				spanChild = spanChild->getNextNode();
 			}
@@ -600,7 +600,7 @@ void UIRichText::positionChildren() {
 	child = mChild;
 	while ( NULL != child ) {
 		if ( child->isWidget() ) {
-			processWidget( static_cast<UIWidget*>( child ), processWidget );
+			processWidget( child->asType<UIWidget>(), processWidget );
 		}
 		child = child->getNextNode();
 	}
diff --git a/src/eepp/ui/uistyle.cpp b/src/eepp/ui/uistyle.cpp
diff --git a/src/eepp/ui/uitextspan.cpp b/src/eepp/ui/uitextspan.cpp
diff --git a/src/eepp/ui/uiwidget.cpp b/src/eepp/ui/uiwidget.cpp
diff --git a/src/eepp/ui/uiwidgetcreator.cpp b/src/eepp/ui/uiwidgetcreator.cpp
diff --git a/src/tests/unit_tests/uicss_inheritance_test.cpp b/src/tests/unit_tests/uicss_inheritance_test.cpp

Original file line number	Diff line number	Diff line change
`@@ -543,6 +543,8 @@ class EE_API UIWidget : public UINode {`
`543`	`543`	`*/`
`544`	`544`	`virtual bool applyProperty( const StyleSheetProperty& attribute );`
`545`	`545`
	`546`	`+ void propagateInheritedProperty( const CSS::StyleSheetProperty& property );`
	`547`	`+`
`546`	`548`	`/**`
`547`	`549`	`* @brief Gets the padding in density-independent pixels (dp).`
`548`	`550`	`*`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ const std::string& PropertyDefinition::getDefaultValue() const {`
`30`	`30`	`return mDefaultValue;`
`31`	`31`	`}`
`32`	`32`
`33`		`-bool PropertyDefinition::getInherited() const {`
	`33`	`+bool PropertyDefinition::isInherited() const {`
`34`	`34`	`return mInherited;`
`35`	`35`	`}`
`36`	`36`