X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Ftext-label-multi-language%2Ftext-label-multi-language-example.cpp;h=0edaf8b92941acd767509e1cbfb385bd9933c8a5;hb=refs%2Fchanges%2F85%2F242285%2F1;hp=ba54b57a91942c969dd71720b1568f47f04d268f;hpb=312470da17142a335f5f743630b7fc19c0061ead;p=platform%2Fcore%2Fuifw%2Fdali-demo.git diff --git a/examples/text-label-multi-language/text-label-multi-language-example.cpp b/examples/text-label-multi-language/text-label-multi-language-example.cpp index ba54b57..0edaf8b 100644 --- a/examples/text-label-multi-language/text-label-multi-language-example.cpp +++ b/examples/text-label-multi-language/text-label-multi-language-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 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. @@ -22,6 +22,7 @@ // EXTERNAL INCLUDES #include +#include // INTERNAL INCLUDES #include "shared/multi-language-strings.h" @@ -56,18 +57,18 @@ public: */ void Create( Application& application ) { - Stage stage = Stage::GetCurrent(); + Window window = application.GetWindow(); - stage.KeyEventSignal().Connect(this, &TextLabelMultiLanguageExample::OnKeyEvent); - stage.SetBackgroundColor( Color::WHITE ); + window.KeyEventSignal().Connect(this, &TextLabelMultiLanguageExample::OnKeyEvent); + window.SetBackgroundColor( Color::WHITE ); mTableView = Toolkit::TableView::New( NUMBER_OF_LANGUAGES, 1 ); mTableView.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); mTableView.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT ); - mTableView.SetParentOrigin( ParentOrigin::TOP_LEFT ); - mTableView.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + mTableView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + mTableView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); mTableView.TouchSignal().Connect( this, &TextLabelMultiLanguageExample::OnTouch ); - stage.Add( mTableView ); + window.Add( mTableView ); for( unsigned int index = 0u; index < NUMBER_OF_LANGUAGES; ++index ) { @@ -84,7 +85,7 @@ public: } } - bool OnTouch( Actor actor, const TouchData& event ) + bool OnTouch( Actor actor, const TouchEvent& event ) { if( 1u == event.GetPointCount() ) { @@ -117,7 +118,7 @@ public: */ void OnKeyEvent(const KeyEvent& event) { - if(event.state == KeyEvent::Down) + if(event.GetState() == KeyEvent::Down) { if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) ) {