Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-06-01 02:56:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes.

Browse Source 
--HG--
branch : dev
This commit is contained in:
Martín Lucas Golini
2019-12-08 13:49:13 -03:00
parent c008ff2003
commit 20a6c8ea37
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/eepp/ui/css/stylesheetspecification.cpp
View File

@@ -165,7 +165,8 @@ void StyleSheetSpecification::registerDefaultProperties() {
registerProperty( "font-family", "", false ).addAlias( "font-name" );
registerProperty( "font-size", "", false )
.setType( PropertyType::NumberFloat )
.addAlias( "text-size" );
.addAlias( "text-size" )
.addAlias( "textsize" );
registerProperty( "font-style", "", false )
.addAlias( "text-style" )
.addAlias( "text-decoration" );
@@ -271,6 +272,8 @@ void StyleSheetSpecification::registerDefaultProperties() {
registerProperty( "scale-origin-point", "", false ).setType( PropertyType::Vector2 );
registerProperty( "word-wrap", "", false ).setType( PropertyType::Bool );
// Shorthands
registerProperty( "background-position", "", false ).setType( PropertyType::NumberLength );
registerProperty( "transition", "", false );

2
src/eepp/ui/uistyle.cpp
View File

@@ -167,7 +167,7 @@ void UIStyle::onStateChange() {
}
}
if ( !mWidget->isSceneNodeLoading() &&
if ( !mWidget->isSceneNodeLoading() && NULL != propertyDefinition &&
StyleSheetPropertyTransition::transitionSupported(
propertyDefinition->getType() ) &&
hasTransition( property.getName() ) ) {