diff options
| author | David Steele <david.steele@samsung.com> | 2016-08-17 19:32:36 +0100 |
|---|---|---|
| committer | David Steele <david.steele@partner.samsung.com> | 2016-08-24 15:37:22 +0100 |
| commit | f531d16a6c051b178b769d636e17b5be87014c07 (patch) | |
| tree | 040b342379256bb39695beebeafa279933d30a64 /shared | |
| parent | 059291c231a79443e563cf7d0e9e76d4655f8805 (diff) | |
| download | dali-demo-f531d16a6c051b178b769d636e17b5be87014c07.tar.gz dali-demo-f531d16a6c051b178b769d636e17b5be87014c07.tar.bz2 dali-demo-f531d16a6c051b178b769d636e17b5be87014c07.zip | |
Fixed up styling following toolkit string comparison
Fixed style paths in build system for images
Changed style names in style sheets to use CamelCase for readability.
Change-Id: I094af8d27e7a8af23555a63e7b76df3e9e1993ec
Signed-off-by: David Steele <david.steele@samsung.com>
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/view.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shared/view.h b/shared/view.h index cc7ca8f0..29e1012d 100644 --- a/shared/view.h +++ b/shared/view.h @@ -94,7 +94,7 @@ Dali::Layer CreateToolbar( Dali::Toolkit::ToolBar& toolBar, { Dali::Toolkit::TextLabel label = Dali::Toolkit::TextLabel::New(); label.SetAnchorPoint( Dali::AnchorPoint::TOP_LEFT ); - label.SetProperty( Dali::Toolkit::Control::Property::STYLE_NAME, "toolbarlabel" ); + label.SetStyleName( "ToolbarLabel" ); label.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT, title ); label.SetProperty( Dali::Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); label.SetProperty( Dali::Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); @@ -168,7 +168,7 @@ Dali::Layer CreateView( Dali::Application& application, Dali::Toolkit::TextLabel CreateToolBarLabel( const std::string& text ) { Dali::Toolkit::TextLabel label = Dali::Toolkit::TextLabel::New( text ); - label.SetProperty( Dali::Toolkit::Control::Property::STYLE_NAME, "toolbarlabel" ); + label.SetStyleName( "ToolbarLabel" ); label.SetProperty( Dali::Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); label.SetProperty( Dali::Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); label.SetResizePolicy( Dali::ResizePolicy::FILL_TO_PARENT, Dali::Dimension::HEIGHT ); |