X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Fsimple-text-visual%2Fsimple-text-visual-example.cpp;h=7279bf43109e039c7cd485cfe85206f5067986bc;hb=1b19fd140ff139b5854a1a62447faf31b175d8f6;hp=89ba3e2ee60c909fbac290ceee4d02ff1a57bf24;hpb=31fe26eea3e2d2a1cd7cbef08afdee5befe4242d;p=platform%2Fcore%2Fuifw%2Fdali-demo.git
diff --git a/examples/simple-text-visual/simple-text-visual-example.cpp b/examples/simple-text-visual/simple-text-visual-example.cpp
index 89ba3e2..7279bf4 100644
--- a/examples/simple-text-visual/simple-text-visual-example.cpp
+++ b/examples/simple-text-visual/simple-text-visual-example.cpp
@@ -32,12 +32,11 @@ using namespace Dali::Toolkit;
class TextVisualExample : public ConnectionTracker
{
public:
-
- TextVisualExample( Application& application )
- : mApplication( application )
+ TextVisualExample(Application& application)
+ : mApplication(application)
{
// Connect to the Application's Init signal
- mApplication.InitSignal().Connect( this, &TextVisualExample::Create );
+ mApplication.InitSignal().Connect(this, &TextVisualExample::Create);
}
~TextVisualExample()
@@ -48,31 +47,24 @@ public:
/**
* One-time setup in response to Application InitSignal.
*/
- void Create( Application& application )
+ void Create(Application& application)
{
Window window = application.GetWindow();
window.KeyEventSignal().Connect(this, &TextVisualExample::OnKeyEvent);
- window.SetBackgroundColor( Color::WHITE );
+ window.SetBackgroundColor(Color::WHITE);
Dali::Toolkit::Control control = Dali::Toolkit::ImageView::New();
- control.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+ control.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
- const std::string markupText( "Hello world" );
+ const std::string markupText("Hello world");
Dali::Property::Map map;
- map.Add( Dali::Toolkit::Visual::Property::TYPE, Dali::Toolkit::Visual::TEXT ).
- Add( Dali::Toolkit::TextVisual::Property::ENABLE_MARKUP, true ).
- Add( Dali::Toolkit::TextVisual::Property::TEXT, markupText ).
- Add( Dali::Toolkit::TextVisual::Property::TEXT_COLOR, Dali::Vector4( 0.25f, 0.25f, 0.5f, 1.f ) ).
- Add( Dali::Toolkit::TextVisual::Property::FONT_FAMILY, "TizenSansRegular" ).
- Add( Dali::Toolkit::TextVisual::Property::POINT_SIZE, 30.f ).
- Add( Dali::Toolkit::TextVisual::Property::HORIZONTAL_ALIGNMENT, "END" ).
- Add( Dali::Toolkit::TextVisual::Property::VERTICAL_ALIGNMENT, "CENTER" );
-
- control.SetProperty( Dali::Toolkit::Control::Property::BACKGROUND, map );
-
- window.Add( control );
+ map.Add(Dali::Toolkit::Visual::Property::TYPE, Dali::Toolkit::Visual::TEXT).Add(Dali::Toolkit::TextVisual::Property::ENABLE_MARKUP, true).Add(Dali::Toolkit::TextVisual::Property::TEXT, markupText).Add(Dali::Toolkit::TextVisual::Property::TEXT_COLOR, Dali::Vector4(0.25f, 0.25f, 0.5f, 1.f)).Add(Dali::Toolkit::TextVisual::Property::FONT_FAMILY, "TizenSansRegular").Add(Dali::Toolkit::TextVisual::Property::POINT_SIZE, 30.f).Add(Dali::Toolkit::TextVisual::Property::HORIZONTAL_ALIGNMENT, "END").Add(Dali::Toolkit::TextVisual::Property::VERTICAL_ALIGNMENT, "CENTER");
+
+ control.SetProperty(Dali::Toolkit::Control::Property::BACKGROUND, map);
+
+ window.Add(control);
}
/**
@@ -80,9 +72,9 @@ public:
*/
void OnKeyEvent(const KeyEvent& event)
{
- if(event.GetState() == KeyEvent::Down)
+ if(event.GetState() == KeyEvent::DOWN)
{
- if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
+ if(IsKey(event, DALI_KEY_ESCAPE) || IsKey(event, DALI_KEY_BACK))
{
mApplication.Quit();
}
@@ -90,25 +82,24 @@ public:
}
private:
-
Application& mApplication;
TextLabel mLabel;
};
-void RunTest( Application& application )
+void RunTest(Application& application)
{
- TextVisualExample test( application );
+ TextVisualExample test(application);
application.MainLoop();
}
/** Entry point for Linux & Tizen applications */
-int DALI_EXPORT_API main( int argc, char **argv )
+int DALI_EXPORT_API main(int argc, char** argv)
{
- Application application = Application::New( &argc, &argv );
+ Application application = Application::New(&argc, &argv);
- RunTest( application );
+ RunTest(application);
return 0;
}