X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Fhomescreen-benchmark%2Fhomescreen-benchmark.cpp;h=fbcf20987c1fb8fdad81164b64d89f08564b2ae3;hb=6d69b52359f4a6ccaea9c9c517b09684081052f0;hp=2493d3ec01afa20e48e88b7648e426a30b0210af;hpb=cc86309efaef5f77c85ece1199f95e08534e4a32;p=platform%2Fcore%2Fuifw%2Fdali-demo.git diff --git a/examples/homescreen-benchmark/homescreen-benchmark.cpp b/examples/homescreen-benchmark/homescreen-benchmark.cpp index 2493d3e..fbcf209 100644 --- a/examples/homescreen-benchmark/homescreen-benchmark.cpp +++ b/examples/homescreen-benchmark/homescreen-benchmark.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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,6 +21,7 @@ #include #include +#include #include using namespace Dali; @@ -163,8 +164,8 @@ public: // Create benchmark script CreateScript(); - // Get a handle to the stage - Stage stage = Stage::GetCurrent(); + // Get a handle to the window + Window window = application.GetWindow(); mScrollParent = Actor::New(); mScrollParent.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); @@ -173,23 +174,23 @@ public: // create background Toolkit::ImageView background = Toolkit::ImageView::New( BACKGROUND_IMAGE ); - Stage::GetCurrent().Add( background ); + window.Add( background ); background.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); background.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); background.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); PopulatePages(); - stage.Add( mScrollParent ); + window.Add( mScrollParent ); - // Respond to a click anywhere on the stage. - stage.GetRootLayer().TouchSignal().Connect( this, &HomescreenBenchmark::OnTouch ); + // Respond to a click anywhere on the window. + window.GetRootLayer().TouchSignal().Connect( this, &HomescreenBenchmark::OnTouch ); // Respond to key events - stage.KeyEventSignal().Connect( this, &HomescreenBenchmark::OnKeyEvent ); + window.KeyEventSignal().Connect( this, &HomescreenBenchmark::OnKeyEvent ); } - bool OnTouch( Actor actor, const TouchData& touch ) + bool OnTouch( Actor actor, const TouchEvent& touch ) { // Quit the application. mApplication.Quit(); @@ -214,7 +215,7 @@ public: pageActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); pageActor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); pageActor.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS ); - pageActor.SetSizeModeFactor( Vector3( PAGE_SCALE_FACTOR_X, PAGE_SCALE_FACTOR_Y, 1.0f ) ); + pageActor.SetProperty( Actor::Property::SIZE_MODE_FACTOR, Vector3( PAGE_SCALE_FACTOR_X, PAGE_SCALE_FACTOR_Y, 1.0f ) ); return pageActor; } @@ -231,10 +232,10 @@ public: imageView.SetProperty( Toolkit::ImageView::Property::IMAGE, map ); imageView.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS ); - imageView.SetSizeScalePolicy( SizeScalePolicy::FIT_WITH_ASPECT_RATIO ); + imageView.SetProperty( Actor::Property::SIZE_SCALE_POLICY, SizeScalePolicy::FIT_WITH_ASPECT_RATIO ); imageView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); imageView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - imageView.SetSizeModeFactor( Vector3( IMAGE_AREA, IMAGE_AREA, 1.0f ) ); + imageView.SetProperty( Actor::Property::SIZE_MODE_FACTOR, Vector3( IMAGE_AREA, IMAGE_AREA, 1.0f ) ); return imageView; } @@ -243,7 +244,7 @@ public: { Toolkit::CheckBoxButton button = Toolkit::CheckBoxButton::New(); button.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS ); - button.SetSizeScalePolicy( SizeScalePolicy::FIT_WITH_ASPECT_RATIO ); + button.SetProperty( Actor::Property::SIZE_SCALE_POLICY, SizeScalePolicy::FIT_WITH_ASPECT_RATIO ); button.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); button.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); button.SetProperty( Toolkit::Button::Property::SELECTED, ( currentIconIndex % 2 == 0 ) ); // Select half the button @@ -253,14 +254,16 @@ public: void AddIconsToPage( Actor page, bool useTextLabel ) { - Size stageSize( Stage::GetCurrent().GetSize() ); - const float scaledHeight = stageSize.y * PAGE_SCALE_FACTOR_Y; - const float scaledWidth = stageSize.x * PAGE_SCALE_FACTOR_X; - const float PADDING = stageSize.y / 64.0f; + Window window = mApplication.GetWindow(); + + Size windowSize( window.GetSize() ); + const float scaledHeight = windowSize.y * PAGE_SCALE_FACTOR_Y; + const float scaledWidth = windowSize.x * PAGE_SCALE_FACTOR_X; + const float PADDING = windowSize.y / 64.0f; const float ROW_HEIGHT = ( scaledHeight - (PADDING*2.0f) ) / static_cast( mConfig.mRows ); const float COL_WIDTH = ( scaledWidth - (PADDING*2.0f) ) / static_cast( mConfig.mCols ); - Vector2 dpi = Stage::GetCurrent().GetDpi(); + Vector2 dpi = window.GetDpi(); static int currentIconIndex = 0; @@ -277,13 +280,13 @@ public: { float rowX = x * COL_WIDTH + PADDING; float rowY = y * ROW_HEIGHT + PADDING; - iconView.SetSize( Vector3( COL_WIDTH, ROW_HEIGHT, 1.0f ) ); - iconView.SetPosition( Vector3( rowX, rowY, 0.0f ) ); + iconView.SetProperty( Actor::Property::SIZE, Vector3( COL_WIDTH, ROW_HEIGHT, 1.0f ) ); + iconView.SetProperty( Actor::Property::POSITION, Vector3( rowX, rowY, 0.0f ) ); } else { iconView.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS ); - iconView.SetSizeScalePolicy( SizeScalePolicy::FIT_WITH_ASPECT_RATIO ); + iconView.SetProperty( Actor::Property::SIZE_SCALE_POLICY, SizeScalePolicy::FIT_WITH_ASPECT_RATIO ); } Actor icon; @@ -372,7 +375,7 @@ public: void PopulatePages() { - Vector3 stageSize( Stage::GetCurrent().GetSize() ); + Vector3 windowSize( mApplication.GetWindow().GetSize() ); for( int i = 0; i < mConfig.mPageCount; ++i ) { @@ -385,12 +388,12 @@ public: // Move page 'a little bit up'. page.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); page.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); - page.SetPosition( Vector3( stageSize.x * i, 0.0f, 0.0f ) ); + page.SetProperty( Actor::Property::POSITION, Vector3( windowSize.x * i, 0.0f, 0.0f ) ); mScrollParent.Add( page ); } - mScrollParent.SetProperty( DevelActor::Property::OPACITY, 1.0f ); - mScrollParent.SetScale( Vector3::ONE ); + mScrollParent.SetProperty( Actor::Property::OPACITY, 1.0f ); + mScrollParent.SetProperty( Actor::Property::SCALE, Vector3::ONE ); // Fade in. ShowAnimation(); @@ -408,18 +411,18 @@ public: void ScrollPages(int pages, float duration, bool flick) { duration *= PAGE_DURATION_SCALE_FACTOR; - Vector3 stageSize( Stage::GetCurrent().GetSize() ); + Vector3 windowSize( mApplication.GetWindow().GetSize() ); mScrollAnimation = Animation::New( duration ); if( flick ) { - mScrollAnimation.AnimateBy( Property( mScrollParent, Actor::Property::POSITION ), Vector3( -stageSize.x * pages, 0.0f, 0.0f ), AlphaFunction::EASE_IN_OUT ); + mScrollAnimation.AnimateBy( Property( mScrollParent, Actor::Property::POSITION ), Vector3( -windowSize.x * pages, 0.0f, 0.0f ), AlphaFunction::EASE_IN_OUT ); } else { int totalPages = abs( pages ); for( int i = 0; i < totalPages; ++i ) { - mScrollAnimation.AnimateBy( Property( mScrollParent, Actor::Property::POSITION ), Vector3( pages < 0 ? stageSize.x : -stageSize.x, 0.0f, 0.0f ), AlphaFunction::EASE_IN_OUT, TimePeriod( duration * i, duration ) ); + mScrollAnimation.AnimateBy( Property( mScrollParent, Actor::Property::POSITION ), Vector3( pages < 0 ? windowSize.x : -windowSize.x, 0.0f, 0.0f ), AlphaFunction::EASE_IN_OUT, TimePeriod( duration * i, duration ) ); } } mScrollAnimation.FinishedSignal().Connect( this, &HomescreenBenchmark::OnAnimationEnd ); @@ -443,7 +446,7 @@ public: 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 ) ) {