X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Fpivot%2Fpivot-example.cpp;h=826b4e4a77cc2eb319f27a1d4dd5406a61a3f6a5;hb=1b19fd140ff139b5854a1a62447faf31b175d8f6;hp=82cfa2f3b0f26d83b307221bdffbba1b12734db3;hpb=cc6ea8d9723ab3a5415bb550acfbf27501de7a62;p=platform%2Fcore%2Fuifw%2Fdali-demo.git diff --git a/examples/pivot/pivot-example.cpp b/examples/pivot/pivot-example.cpp index 82cfa2f..826b4e4 100644 --- a/examples/pivot/pivot-example.cpp +++ b/examples/pivot/pivot-example.cpp @@ -26,17 +26,17 @@ using namespace Dali::Toolkit; namespace { -const int TABLE_VIEW_ROWS = 5; -const int TABLE_VIEW_COLUMNS = 3; -const Vector3 TABLE_VIEW_SIZE_MODE_FACTOR( 0.6f, 0.6f, 1.0f ); +const int TABLE_VIEW_ROWS = 5; +const int TABLE_VIEW_COLUMNS = 3; +const Vector3 TABLE_VIEW_SIZE_MODE_FACTOR(0.6f, 0.6f, 1.0f); -const Quaternion ANIMATION_ROTATION( Degree( 360.0f), Vector3::ZAXIS ); -const AlphaFunction::BuiltinFunction ROTATION_ANIMATION_ALPHA_FUNCTION( AlphaFunction::EASE_IN_OUT ); -const TimePeriod ROTATION_ANIMATION_TIME_PERIOD( 0.0f, 0.5f ); +const Quaternion ANIMATION_ROTATION(Degree(360.0f), Vector3::ZAXIS); +const AlphaFunction::BuiltinFunction ROTATION_ANIMATION_ALPHA_FUNCTION(AlphaFunction::EASE_IN_OUT); +const TimePeriod ROTATION_ANIMATION_TIME_PERIOD(0.0f, 0.5f); -const Vector3 ANIMATION_SCALE( 2.0f, 2.0f, 1.0f ); -const AlphaFunction::BuiltinFunction SCALE_ANIMATION_ALPHA_FUNCTION( AlphaFunction::SIN ); -const TimePeriod SCALE_ANIMATION_TIME_PERIOD( 0.15f, 0.85f ); +const Vector3 ANIMATION_SCALE(2.0f, 2.0f, 1.0f); +const AlphaFunction::BuiltinFunction SCALE_ANIMATION_ALPHA_FUNCTION(AlphaFunction::SIN); +const TimePeriod SCALE_ANIMATION_TIME_PERIOD(0.15f, 0.85f); } // unnamed namespace /** @@ -47,64 +47,62 @@ const TimePeriod SCALE_ANIMATION_TIME_PERIOD( 0.15f, 0.85f ); class PivotController : public ConnectionTracker { public: - /** * @brief Constructor. * @param[in] application Reference to the application instance. */ - PivotController( Application& application ) - : mApplication( application ) + PivotController(Application& application) + : mApplication(application) { - mApplication.InitSignal().Connect( this, &PivotController::Create ); + mApplication.InitSignal().Connect(this, &PivotController::Create); } private: - /** * @brief The Init signal is received once (only) during the Application lifetime. */ - void Create( Application& application ) + void Create(Application& application) { // Get a handle to the window Window window = application.GetWindow(); - window.SetBackgroundColor( Color::WHITE ); - window.KeyEventSignal().Connect( this, &PivotController::OnKeyEvent ); + window.SetBackgroundColor(Color::WHITE); + window.KeyEventSignal().Connect(this, &PivotController::OnKeyEvent); // Create a table view. - TableView tableView = TableView::New( TABLE_VIEW_ROWS, TABLE_VIEW_COLUMNS ); - tableView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); - tableView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - tableView.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS ); - tableView.SetProperty( Actor::Property::SIZE_MODE_FACTOR, TABLE_VIEW_SIZE_MODE_FACTOR ); - window.Add( tableView ); + TableView tableView = TableView::New(TABLE_VIEW_ROWS, TABLE_VIEW_COLUMNS); + tableView.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER); + tableView.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); + tableView.SetResizePolicy(ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS); + tableView.SetProperty(Actor::Property::SIZE_MODE_FACTOR, TABLE_VIEW_SIZE_MODE_FACTOR); + window.Add(tableView); // Create a tap detector - we are going to rotate an actor round our anchor-point (pivot) when one of our controls is tapped. mTapDetector = TapGestureDetector::New(); - mTapDetector.DetectedSignal().Connect( this, &PivotController::OnTap ); + mTapDetector.DetectedSignal().Connect(this, &PivotController::OnTap); - Vector3 anchorPoint( AnchorPoint::CENTER ); // This will be changed depending on the row and column. + Vector3 anchorPoint(AnchorPoint::CENTER); // This will be changed depending on the row and column. // Add controls to the table-view - each control will have a random color. - for( int row = 0; row < TABLE_VIEW_ROWS; ++row ) + for(int row = 0; row < TABLE_VIEW_ROWS; ++row) { - anchorPoint.y = ( row % TABLE_VIEW_ROWS ) * ( 1.0f / ( TABLE_VIEW_ROWS - 1 ) ); // Calculate this row's y anchor-point. + anchorPoint.y = (row % TABLE_VIEW_ROWS) * (1.0f / (TABLE_VIEW_ROWS - 1)); // Calculate this row's y anchor-point. - for( int column = 0; column < TABLE_VIEW_COLUMNS; ++column ) + for(int column = 0; column < TABLE_VIEW_COLUMNS; ++column) { - anchorPoint.x = ( column % TABLE_VIEW_COLUMNS ) * ( 1.0f / ( TABLE_VIEW_COLUMNS - 1 ) ); // Calculate this column's x anchor-point. + anchorPoint.x = (column % TABLE_VIEW_COLUMNS) * (1.0f / (TABLE_VIEW_COLUMNS - 1)); // Calculate this column's x anchor-point. // Create a control with a randomly chosen background color. Control control = Control::New(); - control.SetBackgroundColor( Vector4( Random::Range( 0.0f, 1.0f ), Random::Range( 0.0f, 1.0f ), Random::Range( 0.0f, 1.0f ), 1.0f ) ); - control.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); - control.SetProperty( Actor::Property::POSITION_USES_ANCHOR_POINT, false ); // Ensures the position always uses top-left for its calculations. - control.SetProperty( Actor::Property::ANCHOR_POINT, anchorPoint ); // This anchor-point is used for the rotation and the scale. + control.SetBackgroundColor(Vector4(Random::Range(0.0f, 1.0f), Random::Range(0.0f, 1.0f), Random::Range(0.0f, 1.0f), 1.0f)); + control.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS); + control.SetProperty(Actor::Property::POSITION_USES_ANCHOR_POINT, false); // Ensures the position always uses top-left for its calculations. + control.SetProperty(Actor::Property::ANCHOR_POINT, anchorPoint); // This anchor-point is used for the rotation and the scale. // Add to the table-view - tableView.AddChild( control, TableView::CellPosition( row, column ) ); + tableView.AddChild(control, TableView::CellPosition(row, column)); // Attach each control to the tap-detector so we can start the animation around our anchor point. - mTapDetector.Attach( control ); + mTapDetector.Attach(control); } } } @@ -114,15 +112,15 @@ private: * * Here we will start an animation around our pivot. */ - void OnTap( Actor actor, const TapGesture& /* tap */ ) + void OnTap(Actor actor, const TapGesture& /* tap */) { // Raise the actor to the top. actor.RaiseToTop(); // Create the animation to rotate and scale our actor. - Animation animation = Animation::New( 1.0f ); - animation.AnimateBy( Property( actor, Actor::Property::ORIENTATION ), ANIMATION_ROTATION, ROTATION_ANIMATION_ALPHA_FUNCTION, ROTATION_ANIMATION_TIME_PERIOD ); - animation.AnimateTo( Property( actor, Actor::Property::SCALE ), ANIMATION_SCALE, SCALE_ANIMATION_ALPHA_FUNCTION, SCALE_ANIMATION_TIME_PERIOD ); + Animation animation = Animation::New(1.0f); + animation.AnimateBy(Property(actor, Actor::Property::ORIENTATION), ANIMATION_ROTATION, ROTATION_ANIMATION_ALPHA_FUNCTION, ROTATION_ANIMATION_TIME_PERIOD); + animation.AnimateTo(Property(actor, Actor::Property::SCALE), ANIMATION_SCALE, SCALE_ANIMATION_ALPHA_FUNCTION, SCALE_ANIMATION_TIME_PERIOD); // Play the animation. animation.Play(); @@ -134,11 +132,11 @@ private: * Will use this to quit the application if Back or the Escape key is received * @param[in] event The key event information */ - void OnKeyEvent( const KeyEvent& event ) + void OnKeyEvent(const KeyEvent& event) { - if( event.state == KeyEvent::Down ) + if(event.GetState() == KeyEvent::DOWN) { - if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) ) + if(IsKey(event, Dali::DALI_KEY_ESCAPE) || IsKey(event, Dali::DALI_KEY_BACK)) { mApplication.Quit(); } @@ -146,15 +144,14 @@ private: } private: - - Application& mApplication; ///< Reference to the Application instance. + Application& mApplication; ///< Reference to the Application instance. TapGestureDetector mTapDetector; ///< Used for animating the tapped control. }; -int DALI_EXPORT_API main( int argc, char **argv ) +int DALI_EXPORT_API main(int argc, char** argv) { - Application application = Application::New( &argc, &argv ); - PivotController test( application ); + Application application = Application::New(&argc, &argv); + PivotController test(application); application.MainLoop(); return 0; }