X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Fhello-world%2Fhello-world-example.cpp;h=f0f830e3ae1463624d570b1873f76da55807f65b;hb=2e182925204bf3ef9f2a36cbfbf998e79fbafaf5;hp=9dea8aca90d303cf53d3e9132786f8655df405c4;hpb=163a83fe9fd3f76f733da6bad06e1e67dac8b870;p=platform%2Fcore%2Fuifw%2Fdali-demo.git diff --git a/examples/hello-world/hello-world-example.cpp b/examples/hello-world/hello-world-example.cpp index 9dea8ac..f0f830e 100644 --- a/examples/hello-world/hello-world-example.cpp +++ b/examples/hello-world/hello-world-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 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. @@ -43,41 +43,46 @@ public: { // Get a handle to the stage Stage stage = Stage::GetCurrent(); + stage.SetBackgroundColor( Color::WHITE ); TextLabel textLabel = TextLabel::New( "Hello World" ); - textLabel.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - textLabel.SetName( "hello-world-label" ); + textLabel.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + textLabel.SetProperty( Dali::Actor::Property::NAME, "helloWorldLabel" ); stage.Add( textLabel ); // Respond to a click anywhere on the stage - stage.GetRootLayer().TouchedSignal().Connect( this, &HelloWorldController::OnTouch ); + stage.GetRootLayer().TouchSignal().Connect( this, &HelloWorldController::OnTouch ); + + // Respond to key events + stage.KeyEventSignal().Connect( this, &HelloWorldController::OnKeyEvent ); } - bool OnTouch( Actor actor, const TouchEvent& touch ) + bool OnTouch( Actor actor, const TouchData& touch ) { // quit the application mApplication.Quit(); return true; } + void OnKeyEvent( const KeyEvent& event ) + { + if( event.state == KeyEvent::Down ) + { + if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) ) + { + mApplication.Quit(); + } + } + } + private: Application& mApplication; }; -void RunTest( Application& application ) +int DALI_EXPORT_API main( int argc, char **argv ) { + Application application = Application::New( &argc, &argv ); HelloWorldController test( application ); - application.MainLoop(); -} - -// Entry point for Linux & Tizen applications -// -int main( int argc, char **argv ) -{ - Application application = Application::New( &argc, &argv ); - - RunTest( application ); - return 0; }