projects
/
platform
/
core
/
uifw
/
dali-demo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changes after Visual Depth Index API changed from float to int
[platform/core/uifw/dali-demo.git]
/
examples
/
transitions
/
shadow-button-impl.cpp
diff --git
a/examples/transitions/shadow-button-impl.cpp
b/examples/transitions/shadow-button-impl.cpp
index
8a6ea56
..
135ea16
100644
(file)
--- a/
examples/transitions/shadow-button-impl.cpp
+++ b/
examples/transitions/shadow-button-impl.cpp
@@
-21,6
+21,7
@@
#include <dali-toolkit/devel-api/align-enums.h>
#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
#include <dali-toolkit/devel-api/align-enums.h>
#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
+#include <dali-toolkit/devel-api/controls/control-devel.h>
#include <cstdio>
#include <cstdio>
@@
-124,7
+125,7
@@
bool ShadowButton::GetActiveState()
void ShadowButton::SetCheckState( bool checkState )
{
mCheckState = checkState;
void ShadowButton::SetCheckState( bool checkState )
{
mCheckState = checkState;
-
EnableVisual(
Demo::ShadowButton::Property::CHECKBOX_FG_VISUAL, true );
+
DevelControl::EnableVisual( *this,
Demo::ShadowButton::Property::CHECKBOX_FG_VISUAL, true );
if( Self().OnStage() )
{
if( checkState )
if( Self().OnStage() )
{
if( checkState )
@@
-157,7
+158,7
@@
void ShadowButton::StartTransition( Property::Index transitionId )
iter->mAnimation.FinishedSignal().Disconnect( this, &ShadowButton::OnTransitionFinished );
}
iter->mAnimation.FinishedSignal().Disconnect( this, &ShadowButton::OnTransitionFinished );
}
- iter->mAnimation =
CreateTransition(
iter->mTransitionData );
+ iter->mAnimation =
DevelControl::CreateTransition( *this,
iter->mTransitionData );
StoreTargetLayouts( iter->mTransitionData );
iter->mAnimation.FinishedSignal().Connect( this, &ShadowButton::OnTransitionFinished );
StoreTargetLayouts( iter->mTransitionData );
iter->mAnimation.FinishedSignal().Connect( this, &ShadowButton::OnTransitionFinished );
@@
-189,7
+190,7
@@
void ShadowButton::OnTransitionFinished( Animation& src )
}
case Demo::ShadowButton::Property::UNCHECK_TRANSITION:
{
}
case Demo::ShadowButton::Property::UNCHECK_TRANSITION:
{
-
EnableVisual(
Demo::ShadowButton::Property::CHECKBOX_FG_VISUAL, false );
+
DevelControl::EnableVisual( *this,
Demo::ShadowButton::Property::CHECKBOX_FG_VISUAL, false );
break;
}
}
break;
}
}
@@
-352,26
+353,22
@@
void ShadowButton::ResetVisual(
{
case Demo::ShadowButton::Property::BACKGROUND_VISUAL:
{
{
case Demo::ShadowButton::Property::BACKGROUND_VISUAL:
{
- RegisterVisual( index, visual );
- visual.SetDepthIndex(0.0f);
+ DevelControl::RegisterVisual( *this, index, visual, 0 );
break;
}
case Demo::ShadowButton::Property::CHECKBOX_BG_VISUAL:
{
break;
}
case Demo::ShadowButton::Property::CHECKBOX_BG_VISUAL:
{
- RegisterVisual( index, visual );
- visual.SetDepthIndex(1.0f);
+ DevelControl::RegisterVisual( *this, index, visual, 1 );
break;
}
case Demo::ShadowButton::Property::CHECKBOX_FG_VISUAL:
{
break;
}
case Demo::ShadowButton::Property::CHECKBOX_FG_VISUAL:
{
- RegisterVisual( index, visual, mCheckState );
- visual.SetDepthIndex(2.0f);
+ DevelControl::RegisterVisual( *this, index, visual, mCheckState, 2 );
break;
}
case Demo::ShadowButton::Property::LABEL_VISUAL:
{
break;
}
case Demo::ShadowButton::Property::LABEL_VISUAL:
{
- RegisterVisual( index, visual );
- visual.SetDepthIndex(1.0f);
+ DevelControl::RegisterVisual( *this, index, visual, 1 );
break;
}
}
break;
}
}
@@
-399,7
+396,7
@@
void ShadowButton::ResetVisual(
bool IsTransformProperty( const std::string& property )
{
bool IsTransformProperty( const std::string& property )
{
- const char* transformProperties[]= { "size", "offset", "origin", "anchorPoint", "offset
SizeMode
" };
+ const char* transformProperties[]= { "size", "offset", "origin", "anchorPoint", "offset
Policy", "sizePolicy
" };
const int NUM_TRANSFORM_PROPERTIES = sizeof( transformProperties ) / sizeof( const char * );
bool found=false;
const int NUM_TRANSFORM_PROPERTIES = sizeof( transformProperties ) / sizeof( const char * );
bool found=false;
@@
-418,7
+415,7
@@
void ShadowButton::StoreTargetLayouts( TransitionData transitionData )
{
// Pseudo code
// foreach animator in transitionData
{
// Pseudo code
// foreach animator in transitionData
- // if animator{"property"} in [ "size", "offset", "origin", "anchorPoint", "offset
SizeMode
" ]
+ // if animator{"property"} in [ "size", "offset", "origin", "anchorPoint", "offset
Policy", "sizePolicy
" ]
// transforms{ animator{"target"} }->{animator{"property"}} = animator{"targetValue"}
// transforms{ animator{"target"} }->{animator{"property"}} = animator{"targetValue"}
@@
-496,7
+493,7
@@
void ShadowButton::SetProperty( BaseObject* object, Property::Index index, const
case Demo::ShadowButton::Property::CHECKBOX_FG_VISUAL:
{
impl.ResetVisual( index, impl.mCheckboxFgVisual, value );
case Demo::ShadowButton::Property::CHECKBOX_FG_VISUAL:
{
impl.ResetVisual( index, impl.mCheckboxFgVisual, value );
-
impl.EnableVisual(
Demo::ShadowButton::Property::CHECKBOX_FG_VISUAL, impl.mCheckState );
+
DevelControl::EnableVisual( impl,
Demo::ShadowButton::Property::CHECKBOX_FG_VISUAL, impl.mCheckState );
break;
}
case Demo::ShadowButton::Property::LABEL_VISUAL:
break;
}
case Demo::ShadowButton::Property::LABEL_VISUAL: