Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-08-13 04:42:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Minor changes.

Browse Source 
--HG--
branch : dev-css
This commit is contained in:
Martín Lucas Golini
2019-05-15 00:38:51 -03:00
parent 0c2b9b4f43
commit f30ee4fb3e
3 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/eepp/scene/nodeattribute.hpp
View File

@@ -62,7 +62,7 @@ class NodeAttribute {
const std::string& getName() const;
const std::vector<std::string> getParameters() const;
const std::vector<std::string>& getParameters() const;
bool isEmpty() const;
protected:

2
src/eepp/scene/nodeattribute.cpp
View File

@@ -365,7 +365,7 @@ const std::string& NodeAttribute::FunctionType::getName() const {
return name;
}
const std::vector<std::string> NodeAttribute::FunctionType::getParameters() const {
const std::vector<std::string>& NodeAttribute::FunctionType::getParameters() const {
return parameters;
}

36
src/eepp/ui/uiwidget.cpp
View File

@@ -791,31 +791,33 @@ bool UIWidget::setAttribute( const NodeAttribute& attribute, const Uint32& state
RectangleDrawable * drawable = RectangleDrawable::New();
RectColors rectColors;
if ( Color::isColorString( functionType.getParameters().at(0) ) ) {
rectColors.TopLeft = rectColors.TopRight = Color::fromString( functionType.getParameters().at(0) );
rectColors.BottomLeft = rectColors.BottomRight = Color::fromString( functionType.getParameters().at(1) );
} else if ( functionType.getParameters().size() >= 3 ) {
std::string direction = functionType.getParameters().at(0);
const std::vector<std::string>& params( functionType.getParameters() );
if ( Color::isColorString( params.at(0) ) ) {
rectColors.TopLeft = rectColors.TopRight = Color::fromString( params.at(0) );
rectColors.BottomLeft = rectColors.BottomRight = Color::fromString( params.at(1) );
} else if ( params.size() >= 3 ) {
std::string direction = params.at(0);
String::toLowerInPlace( direction );
if ( direction == "to bottom" ) {
rectColors.TopLeft = rectColors.TopRight = Color::fromString( functionType.getParameters().at(1) );
rectColors.BottomLeft = rectColors.BottomRight = Color::fromString( functionType.getParameters().at(2) );
rectColors.TopLeft = rectColors.TopRight = Color::fromString( params.at(1) );
rectColors.BottomLeft = rectColors.BottomRight = Color::fromString( params.at(2) );
} else if ( direction == "to left" ) {
rectColors.TopLeft = rectColors.BottomLeft = Color::fromString( functionType.getParameters().at(2) );
rectColors.TopRight = rectColors.BottomRight = Color::fromString( functionType.getParameters().at(1) );
rectColors.TopLeft = rectColors.BottomLeft = Color::fromString( params.at(2) );
rectColors.TopRight = rectColors.BottomRight = Color::fromString( params.at(1) );
} else if ( direction == "to right" ) {
rectColors.TopLeft = rectColors.BottomLeft = Color::fromString( functionType.getParameters().at(1) );
rectColors.TopRight = rectColors.BottomRight = Color::fromString( functionType.getParameters().at(2) );
rectColors.TopLeft = rectColors.BottomLeft = Color::fromString( params.at(1) );
rectColors.TopRight = rectColors.BottomRight = Color::fromString( params.at(2) );
} else if ( direction == "to top" ) {
rectColors.TopLeft = rectColors.TopRight = Color::fromString( functionType.getParameters().at(2) );
rectColors.BottomLeft = rectColors.BottomRight = Color::fromString( functionType.getParameters().at(1) );
rectColors.TopLeft = rectColors.TopRight = Color::fromString( params.at(2) );
rectColors.BottomLeft = rectColors.BottomRight = Color::fromString( params.at(1) );
} else {
rectColors.TopLeft = rectColors.TopRight = Color::fromString( functionType.getParameters().at(1) );
rectColors.BottomLeft = rectColors.BottomRight = Color::fromString( functionType.getParameters().at(2) );
rectColors.TopLeft = rectColors.TopRight = Color::fromString( params.at(1) );
rectColors.BottomLeft = rectColors.BottomRight = Color::fromString( params.at(2) );
}
} else {
return setAttribute( "backgroundcolor", functionType.getParameters().at(0) );
return setAttribute( "backgroundcolor", params.at(0) );
}
drawable->setRectColors( rectColors );
@@ -826,7 +828,7 @@ bool UIWidget::setAttribute( const NodeAttribute& attribute, const Uint32& state
} else if ( "foreground" == name ) {
Drawable * res = NULL;
if ( String::startsWith( attribute.getValue(), "#" ) ) {
if ( Color::isColorString( attribute.getValue() ) ) {
setAttribute( NodeAttribute( "foregroundcolor", attribute.getValue() ) );
} else if ( NULL != ( res = DrawableSearcher::searchByName( attribute.getValue() ) ) ) {
setForegroundDrawable( res, res->getDrawableType() == Drawable::SPRITE );