Peter M. Groen / dali-demo

Commit e53846c039d18232735e1dcc522ecba4568bd459

Authored by Adeel Kazmi
2 parents 211ae49f c6636698

[dali_1.0.23] Merge branch 'tizen' 

Change-Id: Ieb60b117c90756b0784338d6407351c0bc7ea8cb
Inline Side-by-side
Showing 3 changed files with 3 additions and 17 deletions
demo/dali-table-view.cpp
  View file @e53846c
@@ -277,6 +277,8 @@ void DaliTableView::Initialize( Application& application ) @@ -277,6 +277,8 @@ void DaliTableView::Initialize( Application& application )
277 277
278 // Add logo 278 // Add logo
279 mLogo = CreateLogo( LOGO_PATH ); 279 mLogo = CreateLogo( LOGO_PATH );
  280 + mRootActor.SetFixedHeight( 1, mLogo.GetImage().GetHeight() + LOGO_BOTTOM_PADDING_HEIGHT );
  281 +
280 Alignment alignment = Alignment::New(); 282 Alignment alignment = Alignment::New();
281 alignment.Add(mLogo); 283 alignment.Add(mLogo);
282 mRootActor.AddChild( alignment, TableView::CellPosition( 1, 0 ) ); 284 mRootActor.AddChild( alignment, TableView::CellPosition( 1, 0 ) );
@@ -707,8 +709,6 @@ void DaliTableView::SetupInnerPageCubeEffect() @@ -707,8 +709,6 @@ void DaliTableView::SetupInnerPageCubeEffect()
707 mScrollViewEffect = customEffect = ScrollViewCustomEffect::New(); 709 mScrollViewEffect = customEffect = ScrollViewCustomEffect::New();
708 mScrollView.SetScrollSnapDuration( EFFECT_SNAP_DURATION ); 710 mScrollView.SetScrollSnapDuration( EFFECT_SNAP_DURATION );
709 mScrollView.SetScrollFlickDuration( EFFECT_FLICK_DURATION ); 711 mScrollView.SetScrollFlickDuration( EFFECT_FLICK_DURATION );
710 - mScrollView.SetScrollSnapAlphaFunction( AlphaFunctions::EaseOutBack );  
711 - mScrollView.SetScrollFlickAlphaFunction( AlphaFunctions::EaseOutBack );  
712 mScrollView.RemoveConstraintsFromChildren(); 712 mScrollView.RemoveConstraintsFromChildren();
713 713
714 customEffect.SetPageSpacing( Vector2( 30.0f, 30.0f ) ); 714 customEffect.SetPageSpacing( Vector2( 30.0f, 30.0f ) );
@@ -920,8 +920,6 @@ void DaliTableView::GenerateCircle( const Size& size, std::vector< unsigned char @@ -920,8 +920,6 @@ void DaliTableView::GenerateCircle( const Size& size, std::vector< unsigned char
920 ImageActor DaliTableView::CreateLogo( std::string imagePath ) 920 ImageActor DaliTableView::CreateLogo( std::string imagePath )
921 { 921 {
922 Image image = Image::New( imagePath ); 922 Image image = Image::New( imagePath );
923 - image.LoadingFinishedSignal().Connect( this, &DaliTableView::OnLogoLoaded );  
924 -  
925 ImageActor logo = ImageActor::New( image ); 923 ImageActor logo = ImageActor::New( image );
926 924
927 logo.SetAnchorPoint( AnchorPoint::CENTER ); 925 logo.SetAnchorPoint( AnchorPoint::CENTER );
@@ -930,11 +928,6 @@ ImageActor DaliTableView::CreateLogo( std::string imagePath ) @@ -930,11 +928,6 @@ ImageActor DaliTableView::CreateLogo( std::string imagePath )
930 return logo; 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 bool DaliTableView::PauseBackgroundAnimation() 931 bool DaliTableView::PauseBackgroundAnimation()
939 { 932 {
940 PauseAnimation(); 933 PauseAnimation();
demo/dali-table-view.h
  View file @e53846c
@@ -327,13 +327,6 @@ private: // Application callbacks & implementation @@ -327,13 +327,6 @@ private: // Application callbacks & implementation
327 Dali::ImageActor CreateLogo( std::string imagePath ); 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 * Timer handler for ending background animation 330 * Timer handler for ending background animation
338 * 331 *
339 * @return Return value for timer handler 332 * @return Return value for timer handler
packaging/com.samsung.dali-demo.spec
  View file @e53846c
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 2
3 Name: com.samsung.dali-demo 3 Name: com.samsung.dali-demo
4 Summary: The OpenGLES Canvas Core Demo 4 Summary: The OpenGLES Canvas Core Demo
5 -Version: 1.0.22 5 +Version: 1.0.23
6 Release: 1 6 Release: 1
7 Group: System/Libraries 7 Group: System/Libraries
8 License: Apache-2.0 8 License: Apache-2.0