projects
/
platform
/
core
/
uifw
/
dali-demo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Revert "Changes after TouchData renamed to TouchEvent""
[platform/core/uifw/dali-demo.git]
/
examples
/
hello-world
/
hello-world-example.cpp
diff --git
a/examples/hello-world/hello-world-example.cpp
b/examples/hello-world/hello-world-example.cpp
index
3685333
..
8e19077
100644
(file)
--- a/
examples/hello-world/hello-world-example.cpp
+++ b/
examples/hello-world/hello-world-example.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 20
14
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-15,10
+15,10
@@
*
*/
*
*/
-#include <dali/dali.h>
-#include <iostream>
+#include <dali-toolkit/dali-toolkit.h>
using namespace Dali;
using namespace Dali;
+using Dali::Toolkit::TextLabel;
// This example shows how to create and display Hello World! using a simple TextActor
//
// This example shows how to create and display Hello World! using a simple TextActor
//
@@
-29,36
+29,29
@@
public:
HelloWorldController( Application& application )
: mApplication( application )
{
HelloWorldController( Application& application )
: mApplication( application )
{
- std::cout << "HelloWorldController::HelloWorldController" << std::endl;
-
// Connect to the Application's Init signal
mApplication.InitSignal().Connect( this, &HelloWorldController::Create );
}
// Connect to the Application's Init signal
mApplication.InitSignal().Connect( this, &HelloWorldController::Create );
}
- ~HelloWorldController()
- {
- // Nothing to do here;
- }
+ ~HelloWorldController() = default; // Nothing to do in destructor
// The Init signal is received once (only) during the Application lifetime
void Create( Application& application )
{
// The Init signal is received once (only) during the Application lifetime
void Create( Application& application )
{
- std::cout << "HelloWorldController::Create" << std::endl;
-
- // Initialize the actor
- TextActor textActor = TextActor::New( "Hello World" );
-
- // Reposition the actor
- textActor.SetParentOrigin( ParentOrigin::CENTER );
+ // Get a handle to the window
+ Window window = application.GetWindow();
+ window.SetBackgroundColor( Color::WHITE );
- // Get a handle to the stage
- Stage stage = Stage::GetCurrent();
+ TextLabel textLabel = TextLabel::New( "Hello World" );
+ textLabel.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+ textLabel.SetProperty( Dali::Actor::Property::NAME, "helloWorldLabel" );
+ window.Add( textLabel );
- //
Display the actor on the stage
-
stage.Add( textActor
);
+ //
Respond to a touch anywhere on the window
+
window.GetRootLayer().TouchSignal().Connect( this, &HelloWorldController::OnTouch
);
- // Respond to
a click anywhere on the stage
-
stage.GetRootLayer().TouchedSignal().Connect( this, &HelloWorldController::OnTouch
);
+ // Respond to
key events
+
window.KeyEventSignal().Connect( this, &HelloWorldController::OnKeyEvent
);
}
bool OnTouch( Actor actor, const TouchEvent& touch )
}
bool OnTouch( Actor actor, const TouchEvent& touch )
@@
-68,24
+61,25
@@
public:
return true;
}
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;
};
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 );
HelloWorldController test( application );
-
application.MainLoop();
application.MainLoop();
-}
-
-// Entry point for Linux & Tizen applications
-//
-int main( int argc, char **argv )
-{
- Application application = Application::New( &argc, &argv );
-
- RunTest( application );
-
return 0;
}
return 0;
}