Commit e53846c039d18232735e1dcc522ecba4568bd459
[dali_1.0.23] Merge branch 'tizen'
Change-Id: Ieb60b117c90756b0784338d6407351c0bc7ea8cb
Showing
3 changed files
with
3 additions
and
17 deletions
demo/dali-table-view.cpp
| ... | ... | @@ -277,6 +277,8 @@ void DaliTableView::Initialize( Application& application ) |
| 277 | 277 | |
| 278 | 278 | // Add logo |
| 279 | 279 | mLogo = CreateLogo( LOGO_PATH ); |
| 280 | + mRootActor.SetFixedHeight( 1, mLogo.GetImage().GetHeight() + LOGO_BOTTOM_PADDING_HEIGHT ); | |
| 281 | + | |
| 280 | 282 | Alignment alignment = Alignment::New(); |
| 281 | 283 | alignment.Add(mLogo); |
| 282 | 284 | mRootActor.AddChild( alignment, TableView::CellPosition( 1, 0 ) ); |
| ... | ... | @@ -707,8 +709,6 @@ void DaliTableView::SetupInnerPageCubeEffect() |
| 707 | 709 | mScrollViewEffect = customEffect = ScrollViewCustomEffect::New(); |
| 708 | 710 | mScrollView.SetScrollSnapDuration( EFFECT_SNAP_DURATION ); |
| 709 | 711 | mScrollView.SetScrollFlickDuration( EFFECT_FLICK_DURATION ); |
| 710 | - mScrollView.SetScrollSnapAlphaFunction( AlphaFunctions::EaseOutBack ); | |
| 711 | - mScrollView.SetScrollFlickAlphaFunction( AlphaFunctions::EaseOutBack ); | |
| 712 | 712 | mScrollView.RemoveConstraintsFromChildren(); |
| 713 | 713 | |
| 714 | 714 | customEffect.SetPageSpacing( Vector2( 30.0f, 30.0f ) ); |
| ... | ... | @@ -920,8 +920,6 @@ void DaliTableView::GenerateCircle( const Size& size, std::vector< unsigned char |
| 920 | 920 | ImageActor DaliTableView::CreateLogo( std::string imagePath ) |
| 921 | 921 | { |
| 922 | 922 | Image image = Image::New( imagePath ); |
| 923 | - image.LoadingFinishedSignal().Connect( this, &DaliTableView::OnLogoLoaded ); | |
| 924 | - | |
| 925 | 923 | ImageActor logo = ImageActor::New( image ); |
| 926 | 924 | |
| 927 | 925 | logo.SetAnchorPoint( AnchorPoint::CENTER ); |
| ... | ... | @@ -930,11 +928,6 @@ ImageActor DaliTableView::CreateLogo( std::string imagePath ) |
| 930 | 928 | return logo; |
| 931 | 929 | } |
| 932 | 930 | |
| 933 | -void DaliTableView::OnLogoLoaded( Dali::Image image ) | |
| 934 | -{ | |
| 935 | - mRootActor.SetFixedHeight( 1, image.GetHeight() + LOGO_BOTTOM_PADDING_HEIGHT ); | |
| 936 | -} | |
| 937 | - | |
| 938 | 931 | bool DaliTableView::PauseBackgroundAnimation() |
| 939 | 932 | { |
| 940 | 933 | PauseAnimation(); | ... | ... |
demo/dali-table-view.h
| ... | ... | @@ -327,13 +327,6 @@ private: // Application callbacks & implementation |
| 327 | 327 | Dali::ImageActor CreateLogo( std::string imagePath ); |
| 328 | 328 | |
| 329 | 329 | /** |
| 330 | - * Callback for when the logo image is loaded | |
| 331 | - * | |
| 332 | - * @param[in] image The loaded logo image | |
| 333 | - */ | |
| 334 | - void OnLogoLoaded( Dali::Image image ); | |
| 335 | - | |
| 336 | - /** | |
| 337 | 330 | * Timer handler for ending background animation |
| 338 | 331 | * |
| 339 | 332 | * @return Return value for timer handler | ... | ... |