Commit cf206a27b278fb2a08c92aec37741e6afb9df6d4
1 parent
c9cb504d
Fixed TextLabel color
Change-Id: I475d3d6bab0a70c25b36dec4eb7b614eed6b5a61
Showing
1 changed file
with
10 additions
and
7 deletions
demo/dali-table-view.cpp
| @@ -251,6 +251,9 @@ void DaliTableView::Initialize( Application& application ) | @@ -251,6 +251,9 @@ void DaliTableView::Initialize( Application& application ) | ||
| 251 | 251 | ||
| 252 | const Vector2 stageSize = Stage::GetCurrent().GetSize(); | 252 | const Vector2 stageSize = Stage::GetCurrent().GetSize(); |
| 253 | 253 | ||
| 254 | + TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get(); | ||
| 255 | + fontClient.SetDpi( 96, 96 ); | ||
| 256 | + | ||
| 254 | // Background | 257 | // Background |
| 255 | mBackground = CreateBackground( mBackgroundImagePath ); | 258 | mBackground = CreateBackground( mBackgroundImagePath ); |
| 256 | // set same size as parent actor | 259 | // set same size as parent actor |
| @@ -521,13 +524,13 @@ Actor DaliTableView::CreateTile( const std::string& name, const std::string& tit | @@ -521,13 +524,13 @@ Actor DaliTableView::CreateTile( const std::string& name, const std::string& tit | ||
| 521 | image.Add( stencil ); | 524 | image.Add( stencil ); |
| 522 | } | 525 | } |
| 523 | 526 | ||
| 524 | - TextLabel label = TextLabel::New(); | ||
| 525 | - label.SetParentOrigin( ParentOrigin::TOP_LEFT ); | ||
| 526 | - label.SetAnchorPoint( AnchorPoint::TOP_LEFT ); | ||
| 527 | - label.SetProperty( TextLabel::PROPERTY_MULTI_LINE, true ); | ||
| 528 | - label.SetProperty( TextLabel::PROPERTY_TEXT, title ); | ||
| 529 | - label.SetColor( Color::WHITE ); | ||
| 530 | - content.Add( label ); | 527 | + TextLabel label = TextLabel::New(); |
| 528 | + label.SetParentOrigin( ParentOrigin::TOP_LEFT ); | ||
| 529 | + label.SetAnchorPoint( AnchorPoint::TOP_LEFT ); | ||
| 530 | + label.SetProperty( TextLabel::PROPERTY_MULTI_LINE, true ); | ||
| 531 | + label.SetProperty( TextLabel::PROPERTY_TEXT, title ); | ||
| 532 | + label.SetColor( Color::BLACK ); | ||
| 533 | + content.Add( label ); | ||
| 531 | 534 | ||
| 532 | // Set the tile to be keyboard focusable | 535 | // Set the tile to be keyboard focusable |
| 533 | tile.SetKeyboardFocusable(true); | 536 | tile.SetKeyboardFocusable(true); |