mirror of
https://github.com/SpartanJ/eepp.git
synced 2026-05-28 17:16:29 +03:00
Fix unit-tests (ups).
Fix an issue when setting an invalid color to the terminal display. Update efsw.
This commit is contained in:
@@ -45,6 +45,14 @@ std::string UITextNode::getPropertyString( const PropertyDefinition* propertyDef
|
||||
break;
|
||||
}
|
||||
|
||||
const StyleSheetProperty* prop = getUIStyle()->getProperty( propertyDef->getPropertyId() );
|
||||
if ( prop )
|
||||
return prop->value();
|
||||
|
||||
if ( propertyDef->isInherited() && getParent() && getParent()->isWidget() )
|
||||
return static_cast<UIWidget*>( getParent() )
|
||||
->getPropertyString( propertyDef, propertyIndex );
|
||||
|
||||
return UIWidget::getPropertyString( propertyDef, propertyIndex );
|
||||
}
|
||||
|
||||
|
||||
@@ -541,7 +541,12 @@ int TerminalDisplay::resetColor( const Uint32& index, const char* name ) {
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
} else if ( String::iequals( "default", name ) ) {
|
||||
unsigned char r, g, b;
|
||||
getColor( index, &r, &g, &b );
|
||||
col = Color( r, g, b, 255 );
|
||||
colorParsed = true;
|
||||
} else if ( Color::isColorString( std::string_view{ name }, true ) ) {
|
||||
col = Color::fromString( name );
|
||||
colorParsed = true;
|
||||
}
|
||||
|
||||
2
src/thirdparty/efsw
vendored
2
src/thirdparty/efsw
vendored
Submodule src/thirdparty/efsw updated: deaeca3875...347397c0e3
Reference in New Issue
Block a user