diff --git a/demo/dali-table-view.cpp b/demo/dali-table-view.cpp index 4f7176b..d060945 100644 --- a/demo/dali-table-view.cpp +++ b/demo/dali-table-view.cpp @@ -277,6 +277,8 @@ void DaliTableView::Initialize( Application& application ) // Add logo mLogo = CreateLogo( LOGO_PATH ); + mRootActor.SetFixedHeight( 1, mLogo.GetImage().GetHeight() + LOGO_BOTTOM_PADDING_HEIGHT ); + Alignment alignment = Alignment::New(); alignment.Add(mLogo); mRootActor.AddChild( alignment, TableView::CellPosition( 1, 0 ) ); @@ -707,8 +709,6 @@ void DaliTableView::SetupInnerPageCubeEffect() mScrollViewEffect = customEffect = ScrollViewCustomEffect::New(); mScrollView.SetScrollSnapDuration( EFFECT_SNAP_DURATION ); mScrollView.SetScrollFlickDuration( EFFECT_FLICK_DURATION ); - mScrollView.SetScrollSnapAlphaFunction( AlphaFunctions::EaseOutBack ); - mScrollView.SetScrollFlickAlphaFunction( AlphaFunctions::EaseOutBack ); mScrollView.RemoveConstraintsFromChildren(); customEffect.SetPageSpacing( Vector2( 30.0f, 30.0f ) ); @@ -920,8 +920,6 @@ void DaliTableView::GenerateCircle( const Size& size, std::vector< unsigned char ImageActor DaliTableView::CreateLogo( std::string imagePath ) { Image image = Image::New( imagePath ); - image.LoadingFinishedSignal().Connect( this, &DaliTableView::OnLogoLoaded ); - ImageActor logo = ImageActor::New( image ); logo.SetAnchorPoint( AnchorPoint::CENTER ); @@ -930,11 +928,6 @@ ImageActor DaliTableView::CreateLogo( std::string imagePath ) return logo; } -void DaliTableView::OnLogoLoaded( Dali::Image image ) -{ - mRootActor.SetFixedHeight( 1, image.GetHeight() + LOGO_BOTTOM_PADDING_HEIGHT ); -} - bool DaliTableView::PauseBackgroundAnimation() { PauseAnimation(); diff --git a/demo/dali-table-view.h b/demo/dali-table-view.h index 78b1015..f59e6ef 100644 --- a/demo/dali-table-view.h +++ b/demo/dali-table-view.h @@ -327,13 +327,6 @@ private: // Application callbacks & implementation Dali::ImageActor CreateLogo( std::string imagePath ); /** - * Callback for when the logo image is loaded - * - * @param[in] image The loaded logo image - */ - void OnLogoLoaded( Dali::Image image ); - - /** * Timer handler for ending background animation * * @return Return value for timer handler diff --git a/packaging/com.samsung.dali-demo.spec b/packaging/com.samsung.dali-demo.spec index 2257a12..75d509e 100755 --- a/packaging/com.samsung.dali-demo.spec +++ b/packaging/com.samsung.dali-demo.spec @@ -2,7 +2,7 @@ Name: com.samsung.dali-demo Summary: The OpenGLES Canvas Core Demo -Version: 1.0.22 +Version: 1.0.23 Release: 1 Group: System/Libraries License: Apache-2.0