Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-06-04 20:46:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

More WIP.

Browse Source 
--HG--
branch : dev
This commit is contained in:
Martí­n Lucas Golini
2019-01-06 22:21:49 -03:00
parent c69dc884c2
commit c88ec38c1e
3 changed files with 38 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/assets/layouts/test.css
View File

@@ -70,10 +70,12 @@ Tooltip {
#tpad {
scale: 1;
rotation: 0;
transition: scale 0.25s, rotation 0.25s;
layout_margin: 0;
transition: scale 0.25s, rotation 0.25s 0.25s, layout_margin 0.25s;
}
#tpad:hover {
scale: 1.1;
rotation: 3;
layout_margin: 8dp 0 0 0;
}

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

@@ -78,7 +78,7 @@ bool UIStyle::hasTransition( const Uint32& state, const std::string& propertyNam
// When transitions are declared without state are global
if ( !ret && state != StateFlagNormal ) {
ret = mTransitions.find( StateFlagNormal ) != mTransitions.end() && mTransitions[ StateFlagNormal ].find( propertyName ) != mTransitions[ state ].end();
ret = mTransitions.find( StateFlagNormal ) != mTransitions.end() && mTransitions[ StateFlagNormal ].find( propertyName ) != mTransitions[ StateFlagNormal ].end();
}
return ret;
@@ -93,7 +93,7 @@ UIStyle::TransitionInfo UIStyle::getTransition( const Uint32& state, const std::
} else if ( mTransitions.find( StateFlagNormal ) != mTransitions.end() ) {
propertyTransitionIt = mTransitions[ StateFlagNormal ].find( propertyName );
if ( propertyTransitionIt != mTransitions[ state ].end() ) {
if ( propertyTransitionIt != mTransitions[ StateFlagNormal ].end() ) {
return propertyTransitionIt->second;
}
}

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

@@ -688,16 +688,31 @@ bool UIWidget::setAttribute( const NodeAttribute& attribute, const Uint32& state
}
}
}
} else if ( "layout_margin" == name ) {
setLayoutMargin( attribute.asRect() );
} else if ( "layout_marginleft" == name ) {
setLayoutMargin( Rect( attribute.asDpDimensionI(), mLayoutMargin.Top, mLayoutMargin.Right, mLayoutMargin.Bottom ) );
} else if ( "layout_marginright" == name ) {
setLayoutMargin( Rect( mLayoutMargin.Left, mLayoutMargin.Top, attribute.asDpDimensionI(), mLayoutMargin.Bottom ) );
} else if ( "layout_margintop" == name ) {
setLayoutMargin( Rect( mLayoutMargin.Left, attribute.asDpDimensionI(), mLayoutMargin.Right, mLayoutMargin.Bottom ) );
} else if ( "layout_marginbottom" == name ) {
setLayoutMargin( Rect( mLayoutMargin.Left, mLayoutMargin.Top, mLayoutMargin.Right, attribute.asDpDimensionI() ) );
} else if ( String::startsWith( name, "layout_margin" ) ) {
Rect margin;
if ( "layout_margin" == name )
margin = attribute.asRect();
else if ( "layout_marginleft" == name )
margin = Rect( attribute.asDpDimensionI(), mLayoutMargin.Top, mLayoutMargin.Right, mLayoutMargin.Bottom );
else if ( "layout_marginright" == name )
margin = Rect( mLayoutMargin.Left, mLayoutMargin.Top, attribute.asDpDimensionI(), mLayoutMargin.Bottom );
else if ( "layout_margintop" == name )
margin = Rect( mLayoutMargin.Left, attribute.asDpDimensionI(), mLayoutMargin.Right, mLayoutMargin.Bottom );
else if ( "layout_marginbottom" == name )
margin = Rect( mLayoutMargin.Left, mLayoutMargin.Top, mLayoutMargin.Right, attribute.asDpDimensionI() );
if ( NULL != mStyle && mStyle->hasTransition( state, attribute.getName() ) ) {
UIStyle::TransitionInfo transitionInfo( mStyle->getTransition( state, attribute.getName() ) );
Action * action = Actions::MarginMove::New( mLayoutMargin, margin, transitionInfo.duration, transitionInfo.timingFunction );
if ( Time::Zero != transitionInfo.delay )
action = Actions::Sequence::New( Actions::Delay::New( transitionInfo.delay ), action );
runAction( action );
} else {
setLayoutMargin( margin );
}
} else if ( "tooltip" == name ) {
setTooltipText( attribute.asString() );
} else if ( "layout_weight" == name ) {
@@ -791,14 +806,12 @@ bool UIWidget::setAttribute( const NodeAttribute& attribute, const Uint32& state
if ( NULL != mStyle && mStyle->hasTransition( state, attribute.getName() ) ) {
UIStyle::TransitionInfo transitionInfo( mStyle->getTransition( state, attribute.getName() ) );
Float newRotation( mStyle->getAttribute( state, { attribute.getName() } ).asFloat() );
Action * action = NULL;
Action * action = Actions::Rotate::New( mRotation, newRotation, transitionInfo.duration, transitionInfo.timingFunction );
if ( Time::Zero == transitionInfo.delay ) {
action = Actions::Rotate::New( mRotation, newRotation, transitionInfo.duration, transitionInfo.timingFunction );
}
if ( Time::Zero != transitionInfo.delay )
action = Actions::Sequence::New( Actions::Delay::New( transitionInfo.delay ), action );
if ( NULL != action )
runAction( action );
runAction( action );
} else {
setRotation( attribute.asFloat() );
}
@@ -806,14 +819,12 @@ bool UIWidget::setAttribute( const NodeAttribute& attribute, const Uint32& state
if ( NULL != mStyle && mStyle->hasTransition( state, attribute.getName() ) ) {
UIStyle::TransitionInfo transitionInfo( mStyle->getTransition( state, attribute.getName() ) );
Vector2f newScale( mStyle->getAttribute( state, { attribute.getName() } ).asVector2f() );
Action * action = NULL;
Action * action = Actions::Scale::New( mScale, newScale, transitionInfo.duration, transitionInfo.timingFunction );
if ( Time::Zero == transitionInfo.delay ) {
action = Actions::Scale::New( mScale, newScale, transitionInfo.duration, transitionInfo.timingFunction );
}
if ( Time::Zero != transitionInfo.delay )
action = Actions::Sequence::New( Actions::Delay::New( transitionInfo.delay ), action );
if ( NULL != action )
runAction( action );
runAction( action );
} else {
setScale( attribute.asVector2f() );
}