X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Fradial-menu%2Fradial-menu-example.cpp;h=40bf3087856f46a7f4f4c177dd0d1183df10464f;hb=f2a8bae920f84890d8c6585152917eb4b832fe94;hp=bce680f06ea2af82a51f5d22cdfba8035284a3f8;hpb=27cfb443ff372251c5574607a3f970b382925465;p=platform%2Fcore%2Fuifw%2Fdali-demo.git diff --git a/examples/radial-menu/radial-menu-example.cpp b/examples/radial-menu/radial-menu-example.cpp index bce680f..40bf308 100644 --- a/examples/radial-menu/radial-menu-example.cpp +++ b/examples/radial-menu/radial-menu-example.cpp @@ -17,7 +17,7 @@ #include #include -#include "../shared/view.h" +#include "shared/view.h" #include "radial-sweep-view.h" #include "radial-sweep-view-impl.h" @@ -165,6 +165,7 @@ void RadialMenuExample::OnInit(Application& app) Image dial = ResourceImage::New( TEST_DIAL_FILENAME ); mDialActor = ImageActor::New( dial ); + mDialActor.SetResizePolicy( USE_NATURAL_SIZE, ALL_DIMENSIONS ); mDialActor.SetPositionInheritanceMode(USE_PARENT_POSITION); mDialActor.SetScale(scale); Layer dialLayer = Layer::New(); @@ -189,8 +190,8 @@ void RadialMenuExample::StartAnimation() mRadialSweepView1.Activate(mAnimation, 0.0f, 3.0f); mRadialSweepView2.Activate(mAnimation, 1.5f, 3.0f); mRadialSweepView3.Activate(mAnimation, 3.0f, 3.0f); - mAnimation.OpacityTo(mDialActor, 1.0f, AlphaFunctions::EaseIn, 0.0f, 0.8f); - mAnimation.OpacityTo(mRadialSweepView1, 1.0f, AlphaFunctions::EaseIn, 0.0f, 0.5f); + mAnimation.AnimateTo( Property( mDialActor, Actor::Property::COLOR_ALPHA ), 1.0f, AlphaFunctions::EaseIn, TimePeriod( 0.0f, 0.8f ) ); + mAnimation.AnimateTo( Property( mRadialSweepView1, Actor::Property::COLOR_ALPHA ), 1.0f, AlphaFunctions::EaseIn, TimePeriod( 0.0f, 0.5f ) ); mAnimation.FinishedSignal().Connect( this, &RadialMenuExample::OnAnimationFinished ); mAnimationState = PLAYING; @@ -242,6 +243,7 @@ RadialSweepView RadialMenuExample::CreateSweepView( std::string imageName, mImageActor = ImageActor::New(image); mImageActor.SetParentOrigin(ParentOrigin::CENTER); mImageActor.SetAnchorPoint(AnchorPoint::CENTER); + mImageActor.SetResizePolicy( USE_NATURAL_SIZE, ALL_DIMENSIONS ); // Create the stencil Vector2 imageSize = ResourceImage::GetImageSize(imageName);