Peter M. Groen / dali-demo

Commit de0a187f199290082b0308bd8d4fa824920dbc39

Authored by Adeel Kazmi
1 parent 082ae2a3

Changed top-bar of demo 

Change-Id: I70039ed0957078c87ef22a20e4af3d362389defb
Inline Side-by-side
Showing 2 changed files with 8 additions and 5 deletions
demo/dali-table-view.cpp
  View file @de0a187
... ... @@ -39,11 +39,13 @@ const std::string BUTTON_CANCEL( "Cancel" );
39 39  
40 40 const std::string DEFAULT_BACKGROUND_IMAGE_PATH( DALI_IMAGE_DIR "background-gradient.jpg" );
41 41 const std::string LOGO_PATH( DALI_IMAGE_DIR "dali-logo.png" );
42   -const std::string DEFAULT_TOOLBAR_IMAGE_PATH( DALI_IMAGE_DIR "top-bar-demo.png" );
  42 +const std::string DEFAULT_TOOLBAR_IMAGE_PATH( DALI_IMAGE_DIR "top-bar.png" );
43 43 const std::string BUTTON_BACKGROUND(DALI_IMAGE_DIR "button-background.png");
44 44 const std::string TILE_BACKGROUND(DALI_IMAGE_DIR "item-background.png");
45 45 const std::string TILE_BACKGROUND_ALPHA(DALI_IMAGE_DIR "item-background-alpha.png");
46 46  
  47 +const char * const DEFAULT_TOOLBAR_TEXT( "TOUCH TO LAUNCH EXAMPLE" );
  48 +
47 49 const float BUTTON_PRESS_ANIMATION_TIME = 0.25f; ///< Time to perform button scale effect.
48 50 const float ROTATE_ANIMATION_TIME = 0.5f; ///< Time to perform rotate effect.
49 51 const int MAX_PAGES = 256; ///< Maximum pages (arbitrary safety limit)
... ... @@ -78,8 +80,8 @@ const Vector4 BACKGROUND_COLOR( 1.0f, 1.0f, 1.0f, 1.0f );
78 80 const std::string DEFAULT_TEXT_STYLE_FONT_FAMILY("HelveticaNeue");
79 81 const std::string DEFAULT_TEXT_STYLE_FONT_STYLE("Regular");
80 82 const Dali::PointSize DEFAULT_TEXT_STYLE_POINT_SIZE( 8.0f );
81   -const Dali::TextStyle::Weight DEFAULT_TEXT_STYLE_WEIGHT(Dali::TextStyle::LIGHT);
82   -const Dali::Vector4 DEFAULT_TEXT_STYLE_COLOR(0.0f, 0.75f, 1.0f, 1.0f);
  83 +const Dali::TextStyle::Weight DEFAULT_TEXT_STYLE_WEIGHT(Dali::TextStyle::REGULAR);
  84 +const Dali::Vector4 DEFAULT_TEXT_STYLE_COLOR(0.7f, 0.7f, 0.7f, 1.0f);
83 85  
84 86 const std::string TABLE_TEXT_STYLE_FONT_FAMILY("HelveticaNeue");
85 87 const std::string TABLE_TEXT_STYLE_FONT_STYLE("Regular");
... ... @@ -95,6 +97,7 @@ TextStyle GetDefaultTextStyle()
95 97 textStyle.SetFontPointSize(DEFAULT_TEXT_STYLE_POINT_SIZE);
96 98 textStyle.SetWeight(DEFAULT_TEXT_STYLE_WEIGHT);
97 99 textStyle.SetTextColor(DEFAULT_TEXT_STYLE_COLOR);
  100 + textStyle.SetShadow( true );
98 101 return textStyle;
99 102 }
100 103  
... ... @@ -281,7 +284,7 @@ void DaliTableView::Initialize( Application&amp; application )
281 284 Stage::GetCurrent().Add( mRootActor );
282 285  
283 286 // Toolbar at top
284   - CreateToolbar( mRootActor, std::string(), DEFAULT_TOOLBAR_IMAGE_PATH );
  287 + CreateToolbar( mRootActor, DEFAULT_TOOLBAR_TEXT, DEFAULT_TOOLBAR_IMAGE_PATH );
285 288  
286 289 // Add logo
287 290 mLogo = CreateLogo( LOGO_PATH );
... ... @@ -502,7 +505,7 @@ void DaliTableView::Populate()
502 505 pageNumberText.ApplyConstraint( Constraint::New< Quaternion >( Actor::ROTATION, Source( tableView, Actor::WORLD_ROTATION ), EqualToConstraint() ) );
503 506 pageNumberText.ApplyConstraint( Constraint::New< Vector4 >( Actor::COLOR, Source( tableView, Actor::COLOR ), EqualToConstraint() ) );
504 507  
505   - Stage::GetCurrent().Add( pageNumberText );
  508 + //Stage::GetCurrent().Add( pageNumberText );
506 509  
507 510 // Set tableview position
508 511 Vector3 tableViewPos( stageSize.x * TABLE_RELATIVE_SIZE.x * t, 0.0f, 0.0f );
... ...
demo/images/top-bar-demo.png deleted
View file @082ae2a

4.2 KB