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
Further Setter/Getter public API removal from Dali::Actor
[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
9dea8ac
..
f0f830e
100644
(file)
--- a/
examples/hello-world/hello-world-example.cpp
+++ b/
examples/hello-world/hello-world-example.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
4
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
8
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.
@@
-43,41
+43,46
@@
public:
{
// Get a handle to the stage
Stage stage = Stage::GetCurrent();
{
// Get a handle to the stage
Stage stage = Stage::GetCurrent();
+ stage.SetBackgroundColor( Color::WHITE );
TextLabel textLabel = TextLabel::New( "Hello World" );
TextLabel textLabel = TextLabel::New( "Hello World" );
- textLabel.Set
AnchorPoint(
AnchorPoint::TOP_LEFT );
- textLabel.Set
Name( "hello-world-l
abel" );
+ textLabel.Set
Property( Actor::Property::ANCHOR_POINT,
AnchorPoint::TOP_LEFT );
+ textLabel.Set
Property( Dali::Actor::Property::NAME, "helloWorldL
abel" );
stage.Add( textLabel );
// Respond to a click anywhere on the stage
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 Touch
Event
& touch )
+ bool OnTouch( Actor actor, const Touch
Data
& touch )
{
// quit the application
mApplication.Quit();
return true;
}
{
// 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;
};
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;
}