X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Ftext-fonts%2Ftext-fonts-example.cpp;h=cd208147cefe2012df9491d6a34364b16d588c81;hb=82b918dbf06743b21be30bd10d7d6eb9fe58e339;hp=9cc4d8ee6e38918f145c7374eddabc24fa2e1933;hpb=24c8baf69f0196d4a9a6ad746b370d026532a585;p=platform%2Fcore%2Fuifw%2Fdali-demo.git diff --git a/examples/text-fonts/text-fonts-example.cpp b/examples/text-fonts/text-fonts-example.cpp index 9cc4d8e..cd20814 100644 --- a/examples/text-fonts/text-fonts-example.cpp +++ b/examples/text-fonts/text-fonts-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -80,8 +80,10 @@ public: } else { - textLabel.SetProperty( TextLabel::Property::SHADOW_OFFSET, Vector2( 0.3f, 0.3f ) ); - textLabel.SetProperty( TextLabel::Property::SHADOW_COLOR, Color::BLACK ); + Property::Map shadowMap; + shadowMap.Insert( "color", Color::BLACK ); + shadowMap.Insert( "offset", Vector2( 0.3f, 0.3f ) ); + textLabel.SetProperty( TextLabel::Property::SHADOW, shadowMap ); textLabel.SetProperty( TextLabel::Property::TEXT_COLOR, Color::BLUE ); } textLabel.SetBackgroundColor( color ); @@ -185,7 +187,7 @@ public: CreateTextLabel ( mLabel, LABEL_TEXT, Color::WHITE ); CreateTextLabel ( mLabel2, LABEL_TEXT, Color::WHITE ); - mLabel2.SetStyleName("textlabel-Rosemary"); + mLabel2.SetStyleName("TextLabelRosemary"); CreateTextLabel ( mLabel3, LABEL_TEXT, Color::WHITE ); mLabel3.SetProperty( TextLabel::Property::FONT_FAMILY, "SamsungOneUI" ); @@ -245,19 +247,10 @@ private: bool mToggle; }; -void RunTest( Application& application ) -{ - TextFontsExample test( application ); - - application.MainLoop(); -} - -/** Entry point for Linux & Tizen applications */ int DALI_EXPORT_API main( int argc, char **argv ) { Application application = Application::New( &argc, &argv, DEMO_THEME_PATH ); - - RunTest( application ); - + TextFontsExample test( application ); + application.MainLoop(); return 0; }