X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=examples%2Fmagnifier%2Fmagnifier-example.cpp;h=0f0f08fa8bef46d315ba04fa356d5b609acceadd;hb=2e182925204bf3ef9f2a36cbfbf998e79fbafaf5;hp=4c8ea21707a0dbdf92cb6503f46c7a3c3c4b6e72;hpb=8054811cf315080dc444dffe373d47c634cd3163;p=platform%2Fcore%2Fuifw%2Fdali-demo.git diff --git a/examples/magnifier/magnifier-example.cpp b/examples/magnifier/magnifier-example.cpp index 4c8ea21..0f0f08f 100644 --- a/examples/magnifier/magnifier-example.cpp +++ b/examples/magnifier/magnifier-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,13 +21,13 @@ #include "shared/view.h" #include - +#include using namespace Dali; namespace { -const char* BACKGROUND_IMAGE( DALI_IMAGE_DIR "background-magnifier.jpg" ); -const char* TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" ); +const char* BACKGROUND_IMAGE( DEMO_IMAGE_DIR "background-magnifier.jpg" ); +const char* TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" ); const char* APPLICATION_TITLE( "Magnifier Example" ); const Vector3 MAGNIFIER_SIZE(0.25f, 0.25f, 0.0f); ///< Magnifier sides should be 25% of the width of the stage const float ANIMATION_DURATION(60.0f); ///< Run animation for a minute before repeating. @@ -173,6 +173,7 @@ public: : mApplication( application ), mView(), mAnimationTime(0.0f), + mAnimationTimeProperty( Property::INVALID_INDEX ), mMagnifierShown(false) { // Connect to the Application's Init signal @@ -193,8 +194,6 @@ public: */ void Create( Application& application ) { - DemoHelper::RequestThemeChange(); - Stage::GetCurrent().KeyEventSignal().Connect(this, &ExampleController::OnKeyEvent); mStageSize = Stage::GetCurrent().GetSize(); @@ -214,27 +213,25 @@ public: TOOLBAR_IMAGE, APPLICATION_TITLE ); - mContent.SetLeaveRequired(true); - mContent.TouchedSignal().Connect( this, &ExampleController::OnTouched ); + mContent.SetProperty( Actor::Property::LEAVE_REQUIRED,true); + mContent.TouchSignal().Connect( this, &ExampleController::OnTouched ); // Create magnifier (controlled by human touch) Layer overlay = Layer::New(); - overlay.SetRelayoutEnabled( false ); - overlay.SetSensitive(false); - overlay.SetParentOrigin( ParentOrigin::CENTER ); - overlay.SetSize(mStageSize); + overlay.SetProperty( Actor::Property::SENSITIVE,false); + overlay.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + overlay.SetProperty( Actor::Property::SIZE, mStageSize); Stage::GetCurrent().Add(overlay); mMagnifier = Toolkit::Magnifier::New(); - mMagnifier.SetRelayoutEnabled( false ); - mMagnifier.SetSourceActor( mView.GetBackgroundLayer() ); - mMagnifier.SetSize( MAGNIFIER_SIZE * mStageSize.width ); // Size of magnifier is in relation to stage width - mMagnifier.SetMagnificationFactor( MAGNIFICATION_FACTOR ); - mMagnifier.SetScale(Vector3::ZERO); + mMagnifier.SetSourceActor( mView ); + mMagnifier.SetProperty( Actor::Property::SIZE, MAGNIFIER_SIZE * mStageSize.width ); // Size of magnifier is in relation to stage width + mMagnifier.SetProperty( Toolkit::Magnifier::Property::MAGNIFICATION_FACTOR, MAGNIFICATION_FACTOR ); + mMagnifier.SetProperty( Actor::Property::SCALE,Vector3::ZERO); overlay.Add( mMagnifier ); // Apply constraint to animate the position of the magnifier. - Constraint constraint = Constraint::New( mMagnifier, Actor::Property::POSITION, ConfinementConstraint(ParentOrigin::CENTER, Vector2::ONE * MAGNIFIER_INDENT, Vector2::ONE * MAGNIFIER_INDENT) ); + Constraint constraint = Constraint::New( mMagnifier, Actor::Property::POSITION, ConfinementConstraint(Vector3( 0.5f, 0.5f, 0.0f ), Vector2::ONE * MAGNIFIER_INDENT, Vector2::ONE * MAGNIFIER_INDENT) ); constraint.AddSource( LocalSource(Actor::Property::SIZE) ); constraint.AddSource( LocalSource(Actor::Property::PARENT_ORIGIN) ); constraint.AddSource( LocalSource(Actor::Property::ANCHOR_POINT) ); @@ -244,13 +241,12 @@ public: // Create bouncing magnifier automatically bounces around screen. mBouncingMagnifier = Toolkit::Magnifier::New(); - mBouncingMagnifier.SetRelayoutEnabled( false ); - mBouncingMagnifier.SetSourceActor( mView.GetBackgroundLayer() ); - mBouncingMagnifier.SetSize( MAGNIFIER_SIZE * mStageSize.width ); // Size of magnifier is in relation to stage width - mBouncingMagnifier.SetMagnificationFactor( MAGNIFICATION_FACTOR ); + mBouncingMagnifier.SetSourceActor( mView ); + mBouncingMagnifier.SetProperty( Actor::Property::SIZE, MAGNIFIER_SIZE * mStageSize.width ); // Size of magnifier is in relation to stage width + mBouncingMagnifier.SetProperty( Toolkit::Magnifier::Property::MAGNIFICATION_FACTOR, MAGNIFICATION_FACTOR ); overlay.Add( mBouncingMagnifier ); - mAnimationTimeProperty = mBouncingMagnifier.RegisterProperty("animation-time", 0.0f); + mAnimationTimeProperty = mBouncingMagnifier.RegisterProperty("animationTime", 0.0f); ContinueAnimation(); // Apply constraint to animate the position of the magnifier. @@ -260,7 +256,7 @@ public: constraint.Apply(); // Apply constraint to animate the source of the magnifier. - constraint = Constraint::New( mBouncingMagnifier, mBouncingMagnifier.GetPropertyIndex( Toolkit::Magnifier::SOURCE_POSITION_PROPERTY_NAME ), MagnifierPathConstraint(mStageSize) ); + constraint = Constraint::New( mBouncingMagnifier, Toolkit::Magnifier::Property::SOURCE_POSITION, MagnifierPathConstraint(mStageSize) ); constraint.AddSource( LocalSource(Actor::Property::SIZE) ); constraint.AddSource( LocalSource(mAnimationTimeProperty) ); constraint.Apply(); @@ -305,33 +301,32 @@ public: * @param[in] actor The actor that received the touch * @param[in] event The touch-event information */ - bool OnTouched( Actor actor, const TouchEvent& event ) + bool OnTouched( Actor actor, const TouchData& event ) { if(event.GetPointCount() > 0) { - const TouchPoint& point = event.GetPoint(0); - switch(point.state) + switch( event.GetState( 0 ) ) { - case TouchPoint::Down: - case TouchPoint::Motion: + case PointState::DOWN: + case PointState::MOTION: { ShowMagnifier(); break; } - case TouchPoint::Up: - case TouchPoint::Leave: - case TouchPoint::Interrupted: + case PointState::UP: + case PointState::LEAVE: + case PointState::INTERRUPTED: { HideMagnifier(); break; } - default: + case PointState::STATIONARY: { break; } } // end switch - Vector3 touchPoint(point.screen); + Vector3 touchPoint( event.GetScreenPosition( 0 ) ); SetMagnifierPosition(touchPoint - mStageSize * 0.5f); } @@ -347,7 +342,7 @@ public: if(!mMagnifierShown) { Animation animation = Animation::New(MAGNIFIER_DISPLAY_DURATION); - animation.AnimateTo(Property(mMagnifier, Actor::Property::SCALE), Vector3::ONE, AlphaFunctions::EaseIn); + animation.AnimateTo(Property(mMagnifier, Actor::Property::SCALE), Vector3::ONE, AlphaFunction::EASE_IN); animation.Play(); mMagnifierShown = true; } @@ -361,7 +356,7 @@ public: if(mMagnifierShown) { Animation animation = Animation::New(MAGNIFIER_DISPLAY_DURATION); - animation.AnimateTo(Property(mMagnifier, Actor::Property::SCALE), Vector3::ZERO, AlphaFunctions::EaseOut); + animation.AnimateTo(Property(mMagnifier, Actor::Property::SCALE), Vector3::ZERO, AlphaFunction::EASE_OUT); animation.Play(); mMagnifierShown = false; } @@ -373,13 +368,13 @@ public: */ void SetMagnifierPosition(const Vector3 position) { - mMagnifier.SetSourcePosition( position ); + mMagnifier.SetProperty( Toolkit::Magnifier::Property::SOURCE_POSITION, position ); // position magnifier glass such that bottom edge is touching/near top of finger. Vector3 glassPosition(position); glassPosition.y -= mStageSize.width * MAGNIFIER_SIZE.height * 0.5f + Stage::GetCurrent().GetDpi().height * FINGER_RADIUS_INCHES; - mMagnifier.SetPosition( glassPosition ); + mMagnifier.SetProperty( Actor::Property::POSITION, glassPosition ); } void OnKeyEvent(const KeyEvent& event) @@ -396,7 +391,7 @@ public: private: Application& mApplication; ///< Application instance - Toolkit::View mView; ///< The view + Toolkit::Control mView; ///< The view Layer mContent; ///< The content layer Toolkit::Magnifier mMagnifier; ///< The manually controlled magnifier Toolkit::Magnifier mBouncingMagnifier; ///< The animating magnifier (swirly animation) @@ -407,20 +402,10 @@ private: }; -void RunTest( Application& application ) +int DALI_EXPORT_API main( int argc, char **argv ) { + Application application = Application::New( &argc, &argv, DEMO_THEME_PATH ); ExampleController test( application ); - application.MainLoop(); -} - -// Entry point for Linux & Tizen applications -// -int main( int argc, char **argv ) -{ - Application application = Application::New( &argc, &argv ); - - RunTest( application ); - return 0; }