X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Ftilt%2Ftilt-example.cpp;h=06bf64e7c046e6518ba814db732a2d9d356386f2;hb=694dced621016315f10a5bdbd3f4552f5e29e380;hp=08d6fd6830d2b07f57982089f65275380d53eceb;hpb=28946d814d1f11fddcc23a887a0e318133147549;p=platform%2Fcore%2Fuifw%2Fdali-demo.git diff --git a/examples/tilt/tilt-example.cpp b/examples/tilt/tilt-example.cpp index 08d6fd6..06bf64e 100644 --- a/examples/tilt/tilt-example.cpp +++ b/examples/tilt/tilt-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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. @@ -41,37 +41,40 @@ public: // The Init signal is received once (only) during the Application lifetime void Create( Application& application ) { - // Get a handle to the stage - Stage stage = Stage::GetCurrent(); - stage.SetBackgroundColor( Color::BLUE); + // Get a handle to the window + Window window = application.GetWindow(); + window.SetBackgroundColor( Color::BLUE); mTextLabel = TextLabel::New( "Tilt Sensor Demo" ); - mTextLabel.SetParentOrigin( ParentOrigin::CENTER ); - mTextLabel.SetAnchorPoint( AnchorPoint::CENTER ); + mTextLabel.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + mTextLabel.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); mTextLabel.SetProperty( TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); mTextLabel.SetProperty( TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); mTextLabel.SetProperty( TextLabel::Property::TEXT_COLOR, Color::WHITE ); mTextLabel.SetProperty( TextLabel::Property::POINT_SIZE, 15.0f ); - mTextLabel.SetName( "tiltLabel" ); - stage.Add( mTextLabel ); + mTextLabel.SetProperty( Dali::Actor::Property::NAME, "tiltLabel" ); + window.Add( mTextLabel ); - // Respond to a click anywhere on the stage - stage.GetRootLayer().TouchedSignal().Connect( this, &TiltController::OnTouch ); + // Respond to a click anywhere on the window + window.GetRootLayer().TouchSignal().Connect( this, &TiltController::OnTouch ); CreateSensor(); + + // Connect signals to allow Back and Escape to exit. + window.KeyEventSignal().Connect( this, &TiltController::OnKeyEvent ); } void CreateSensor() { mTiltSensor = TiltSensor::Get(); - if ( mTiltSensor.Enable() ) + if ( mTiltSensor.Start() ) { // Get notifications when the device is tilted mTiltSensor.TiltedSignal().Connect( this, &TiltController::OnTilted ); } } - bool OnTouch( Actor actor, const TouchEvent& touch ) + bool OnTouch( Actor actor, const TouchData& touch ) { // quit the application mApplication.Quit(); @@ -83,19 +86,32 @@ public: Quaternion pitchRot(Radian(Degree(sensor.GetPitch() * 90.0f)), Vector3(1, 0, 0)); Quaternion rollRot(Radian(Degree(sensor.GetRoll() * 90.0f)), Vector3(0, 1, 0)); - mTextLabel.SetOrientation(Quaternion()); + mTextLabel.SetProperty( Actor::Property::ORIENTATION, Quaternion() ); mTextLabel.RotateBy(rollRot); mTextLabel.RotateBy(pitchRot);; } + /** + * @brief OnKeyEvent signal handler. + * @param[in] event The key event information + */ + 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; TiltSensor mTiltSensor; TextLabel mTextLabel; }; -// Entry point for Linux & Tizen applications -// int DALI_EXPORT_API main( int argc, char **argv ) { Application application = Application::New( &argc, &argv );