X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-selection-toolbar-impl.cpp;h=504e45364e2d9e7ebd33f889ec82eb023bef6f08;hb=fc7f0b361ec4c41e38ce5197dc5685c44fde80a6;hp=022ea1e65bae3f1495c7b6186b1b890544248358;hpb=8dd298d8917641dcc284fceef820410451fb81cb;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.cpp index 022ea1e..504e453 100644 --- a/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 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. @@ -20,7 +20,6 @@ // EXTERNAL INCLUDES #include -#include #include #include #include @@ -178,7 +177,7 @@ void TextSelectionToolbar::OnRelayout( const Vector2& size, RelayoutContainer& c if( mScrollBar ) { float barWidth = std::min( mTableOfButtons.GetNaturalSize().width, size.width ) - 2.f * mScrollBarPadding.x; - mScrollBar.SetSize( Vector2( 0.0f, barWidth ) ); + mScrollBar.SetProperty( Actor::Property::SIZE, Vector2( 0.0f, barWidth ) ); } } @@ -265,7 +264,7 @@ void TextSelectionToolbar::SetUpScrollBar( bool enable ) mScrollBar.SetStyleName( "TextSelectionScrollBar" ); mScrollBar.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_LEFT ); mScrollBar.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); - mScrollBar.SetPosition( mScrollBarPadding.x, -mScrollBarPadding.y ); + mScrollBar.SetProperty( Actor::Property::POSITION, Vector2( mScrollBarPadding.x, -mScrollBarPadding.y )); mScrollBar.SetResizePolicy( Dali::ResizePolicy::FIT_TO_CHILDREN, Dali::Dimension::WIDTH ); mScrollBar.SetProperty( Actor::Property::ORIENTATION, Quaternion( Quaternion( Radian( 1.5f * Math::PI ), Vector3::ZAXIS ) ) ); mScrollBar.SetScrollIndicator( indicator ); @@ -312,7 +311,7 @@ void TextSelectionToolbar::ResizeDividers( Size& size ) for( unsigned int i = 0; i < mDividerIndexes.Count(); ++i ) { Actor divider = mTableOfButtons.GetChildAt( Toolkit::TableView::CellPosition( 0, mDividerIndexes[ i ] ) ); - divider.SetSize( size ); + divider.SetProperty( Actor::Property::SIZE, size ); } RelayoutRequest(); } @@ -327,7 +326,7 @@ void TextSelectionToolbar::SetScrollBarPadding( const Vector2& padding ) mScrollBarPadding = padding; if( mScrollBar ) { - mScrollBar.SetPosition( mScrollBarPadding.x, -mScrollBarPadding.y ); + mScrollBar.SetProperty( Actor::Property::POSITION, Vector2( mScrollBarPadding.x, -mScrollBarPadding.y )); } RelayoutRequest();