X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-selection-popup-impl.cpp;h=2f0c6922bbfa66e553f4ae7c4c972b1588b615f2;hb=2ffec8b73989656f70411ef1a99a721b6f86cd14;hp=10e7f78603069843bc83877f6dc497d3ca930b5c;hpb=4e284359dc32cfcb20c49068406fb341afed833b;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp index 10e7f78..2f0c692 100644 --- a/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 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. @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include @@ -676,7 +675,7 @@ std::string TextSelectionPopup::GetPressedImage() const DALI_LOG_INFO( gLogFilter, Debug::General, "TextSelectionPopup::AddOption\n" ); Toolkit::PushButton option = Toolkit::PushButton::New(); - option.SetName( button.name ); + option.SetProperty( Dali::Actor::Property::NAME, button.name ); option.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); switch( button.id ) @@ -763,9 +762,9 @@ std::string TextSelectionPopup::GetPressedImage() const Toolkit::Control divider = Toolkit::Control::New(); #ifdef DECORATOR_DEBUG - divider.SetName("Text's popup divider"); + divider.SetProperty( Dali::Actor::Property::NAME,"Text's popup divider"); #endif - divider.SetSize( size ); + divider.SetProperty( Actor::Property::SIZE, size ); divider.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT ); divider.SetBackgroundColor( mDividerColor ); mToolbar.AddDivider( divider ); @@ -804,9 +803,9 @@ std::string TextSelectionPopup::GetPressedImage() const { mToolbar.SetProperty( Toolkit::TextSelectionToolbar::Property::MAX_SIZE, mPopupMaxSize ); } - mToolbar.SetParentOrigin( ParentOrigin::CENTER ); + mToolbar.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); #ifdef DECORATOR_DEBUG - mToolbar.SetName("TextSelectionToolbar"); + mToolbar.SetProperty( Dali::Actor::Property::NAME,"TextSelectionToolbar"); #endif self.Add( mToolbar ); }