From: Muhammad Umar Date: Wed, 9 May 2018 17:15:55 +0000 (+0100) Subject: Rename LayoutBase class to LayoutItem. X-Git-Tag: dali_1.3.25~1 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=20b42a9bcaba6b874f2271f03a56da6f884c4053 Rename LayoutBase class to LayoutItem. Fixed destructors (objects with a unique_ptr to an opaque structure cannot use default destructor, instead, the destructor must be in a translation unit where the opaque structure is available. Change-Id: I105907af2ff970346c5418b1121919302a67e80a --- diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Layouting.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Layouting.cpp index 7d8586a..989ad95 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-Layouting.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Layouting.cpp @@ -229,10 +229,10 @@ int UtcDaliLayouting_HboxLayout03(void) hbox1.SetName( "HBox1"); hbox2.SetName( "HBox2"); - hbox1.SetProperty( Toolkit::LayoutBase::ChildProperty::WIDTH_SPECIFICATION, ChildLayoutData::MATCH_PARENT ); - hbox1.SetProperty( Toolkit::LayoutBase::ChildProperty::HEIGHT_SPECIFICATION, ChildLayoutData::MATCH_PARENT ); - hbox2.SetProperty( Toolkit::LayoutBase::ChildProperty::WIDTH_SPECIFICATION, ChildLayoutData::MATCH_PARENT ); - hbox2.SetProperty( Toolkit::LayoutBase::ChildProperty::HEIGHT_SPECIFICATION, ChildLayoutData::MATCH_PARENT ); + hbox1.SetProperty( Toolkit::LayoutItem::ChildProperty::WIDTH_SPECIFICATION, ChildLayoutData::MATCH_PARENT ); + hbox1.SetProperty( Toolkit::LayoutItem::ChildProperty::HEIGHT_SPECIFICATION, ChildLayoutData::MATCH_PARENT ); + hbox2.SetProperty( Toolkit::LayoutItem::ChildProperty::WIDTH_SPECIFICATION, ChildLayoutData::MATCH_PARENT ); + hbox2.SetProperty( Toolkit::LayoutItem::ChildProperty::HEIGHT_SPECIFICATION, ChildLayoutData::MATCH_PARENT ); std::vector< Control > controls; controls.push_back( CreateLeafControl( 20, 40 ) ); @@ -337,10 +337,10 @@ int UtcDaliLayouting_HboxLayout04(void) hbox1.SetName( "HBox1"); // Default spec is to wrap content hbox2.SetName( "HBox2"); - hbox1.SetProperty( Toolkit::LayoutBase::ChildProperty::WIDTH_SPECIFICATION, ChildLayoutData::WRAP_CONTENT ); - hbox1.SetProperty( Toolkit::LayoutBase::ChildProperty::HEIGHT_SPECIFICATION, ChildLayoutData::WRAP_CONTENT ); - hbox2.SetProperty( Toolkit::LayoutBase::ChildProperty::WIDTH_SPECIFICATION, ChildLayoutData::WRAP_CONTENT ); - hbox2.SetProperty( Toolkit::LayoutBase::ChildProperty::HEIGHT_SPECIFICATION, ChildLayoutData::WRAP_CONTENT ); + hbox1.SetProperty( Toolkit::LayoutItem::ChildProperty::WIDTH_SPECIFICATION, ChildLayoutData::WRAP_CONTENT ); + hbox1.SetProperty( Toolkit::LayoutItem::ChildProperty::HEIGHT_SPECIFICATION, ChildLayoutData::WRAP_CONTENT ); + hbox2.SetProperty( Toolkit::LayoutItem::ChildProperty::WIDTH_SPECIFICATION, ChildLayoutData::WRAP_CONTENT ); + hbox2.SetProperty( Toolkit::LayoutItem::ChildProperty::HEIGHT_SPECIFICATION, ChildLayoutData::WRAP_CONTENT ); std::vector< Control > controls; controls.push_back( CreateLeafControl( 80, 40 ) ); @@ -367,7 +367,7 @@ int UtcDaliLayouting_HboxLayout04(void) ++counter; } - controls[6].SetProperty( Toolkit::LayoutBase::ChildProperty::HEIGHT_SPECIFICATION, ChildLayoutData::MATCH_PARENT ); + controls[6].SetProperty( Toolkit::LayoutItem::ChildProperty::HEIGHT_SPECIFICATION, ChildLayoutData::MATCH_PARENT ); auto hbox3 = Control::New(); auto hboxLayout3 = HboxLayout::New(); DevelControl::SetLayout( hbox3, hboxLayout3 ); @@ -446,10 +446,10 @@ int UtcDaliLayouting_VboxLayout01(void) vbox.SetAnchorPoint( AnchorPoint::CENTER ); stage.Add( vbox ); - controls[2].SetProperty( Toolkit::LayoutBase::ChildProperty::WIDTH_SPECIFICATION, ChildLayoutData::MATCH_PARENT ); + controls[2].SetProperty( Toolkit::LayoutItem::ChildProperty::WIDTH_SPECIFICATION, ChildLayoutData::MATCH_PARENT ); // Check it. - DALI_TEST_EQUALS( controls[2].GetProperty( Toolkit::LayoutBase::ChildProperty::WIDTH_SPECIFICATION ), Property::Value( ChildLayoutData::MATCH_PARENT ), TEST_LOCATION ); + DALI_TEST_EQUALS( controls[2].GetProperty( Toolkit::LayoutItem::ChildProperty::WIDTH_SPECIFICATION ), Property::Value( ChildLayoutData::MATCH_PARENT ), TEST_LOCATION ); // Ensure layouting happens application.SendNotification(); @@ -492,8 +492,8 @@ int UtcDaliLayouting_VboxLayout02(void) vbox.SetName( "Vbox"); hbox.Add( vbox ); - vbox.SetProperty( Toolkit::LayoutBase::ChildProperty::WIDTH_SPECIFICATION, ChildLayoutData::WRAP_CONTENT ); - vbox.SetProperty( Toolkit::LayoutBase::ChildProperty::HEIGHT_SPECIFICATION, ChildLayoutData::MATCH_PARENT ); + vbox.SetProperty( Toolkit::LayoutItem::ChildProperty::WIDTH_SPECIFICATION, ChildLayoutData::WRAP_CONTENT ); + vbox.SetProperty( Toolkit::LayoutItem::ChildProperty::HEIGHT_SPECIFICATION, ChildLayoutData::MATCH_PARENT ); std::vector< Control > controls; controls.push_back( CreateLeafControl( 40, 40 ) ); @@ -508,10 +508,10 @@ int UtcDaliLayouting_VboxLayout02(void) vbox.SetParentOrigin( ParentOrigin::CENTER ); vbox.SetAnchorPoint( AnchorPoint::CENTER ); - controls[2].SetProperty( Toolkit::LayoutBase::ChildProperty::WIDTH_SPECIFICATION, ChildLayoutData::MATCH_PARENT ); + controls[2].SetProperty( Toolkit::LayoutItem::ChildProperty::WIDTH_SPECIFICATION, ChildLayoutData::MATCH_PARENT ); // Check it. - DALI_TEST_EQUALS( controls[2].GetProperty( Toolkit::LayoutBase::ChildProperty::WIDTH_SPECIFICATION ), Property::Value( ChildLayoutData::MATCH_PARENT ), TEST_LOCATION ); + DALI_TEST_EQUALS( controls[2].GetProperty( Toolkit::LayoutItem::ChildProperty::WIDTH_SPECIFICATION ), Property::Value( ChildLayoutData::MATCH_PARENT ), TEST_LOCATION ); // Ensure layouting happens application.SendNotification(); @@ -566,8 +566,8 @@ int UtcDaliLayouting_VboxLayout03(void) vbox.SetName( "Vbox"); hbox.Add( vbox ); - vbox.SetProperty( Toolkit::LayoutBase::ChildProperty::WIDTH_SPECIFICATION, ChildLayoutData::WRAP_CONTENT ); - vbox.SetProperty( Toolkit::LayoutBase::ChildProperty::HEIGHT_SPECIFICATION, ChildLayoutData::MATCH_PARENT ); + vbox.SetProperty( Toolkit::LayoutItem::ChildProperty::WIDTH_SPECIFICATION, ChildLayoutData::WRAP_CONTENT ); + vbox.SetProperty( Toolkit::LayoutItem::ChildProperty::HEIGHT_SPECIFICATION, ChildLayoutData::MATCH_PARENT ); std::vector< Control > controls; controls.push_back( CreateLeafControl( 40, 40 ) ); @@ -582,10 +582,10 @@ int UtcDaliLayouting_VboxLayout03(void) vbox.SetParentOrigin( ParentOrigin::CENTER ); vbox.SetAnchorPoint( AnchorPoint::CENTER ); - controls[2].SetProperty( Toolkit::LayoutBase::ChildProperty::WIDTH_SPECIFICATION, ChildLayoutData::MATCH_PARENT ); + controls[2].SetProperty( Toolkit::LayoutItem::ChildProperty::WIDTH_SPECIFICATION, ChildLayoutData::MATCH_PARENT ); // Check it. - DALI_TEST_EQUALS( controls[2].GetProperty( Toolkit::LayoutBase::ChildProperty::WIDTH_SPECIFICATION ), Property::Value( ChildLayoutData::MATCH_PARENT ), TEST_LOCATION ); + DALI_TEST_EQUALS( controls[2].GetProperty( Toolkit::LayoutItem::ChildProperty::WIDTH_SPECIFICATION ), Property::Value( ChildLayoutData::MATCH_PARENT ), TEST_LOCATION ); // Ensure layouting happens application.SendNotification(); diff --git a/dali-toolkit/devel-api/controls/control-devel.cpp b/dali-toolkit/devel-api/controls/control-devel.cpp index b5c65e1..29ceb14 100755 --- a/dali-toolkit/devel-api/controls/control-devel.cpp +++ b/dali-toolkit/devel-api/controls/control-devel.cpp @@ -110,26 +110,26 @@ void SetInputMethodContext( Internal::Control& control, InputMethodContext& inpu Internal::Control::Impl::Get( control ).SetInputMethodContext( inputMethodContext ); } -Toolkit::LayoutBase GetLayout( Control control ) +Toolkit::LayoutItem GetLayout( Control control ) { const Internal::Control& internalControl = Toolkit::Internal::GetImplementation( control ); const Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get( internalControl ); - return Toolkit::LayoutBase( controlDataImpl.GetLayout().Get() ); + return Toolkit::LayoutItem( controlDataImpl.GetLayout().Get() ); } -Toolkit::LayoutBase GetLayout( Internal::Control& control ) +Toolkit::LayoutItem GetLayout( Internal::Control& control ) { Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get( control ); - return Toolkit::LayoutBase( controlDataImpl.GetLayout().Get() ); + return Toolkit::LayoutItem( controlDataImpl.GetLayout().Get() ); } -void SetLayout( Internal::Control& control, Toolkit::LayoutBase layout ) +void SetLayout( Internal::Control& control, Toolkit::LayoutItem layout ) { Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get( control ); controlDataImpl.SetLayout( GetImplementation( layout ) ); } -void SetLayout( Control control, Toolkit::LayoutBase layout ) +void SetLayout( Control control, Toolkit::LayoutItem layout ) { Internal::Control& internalControl = Toolkit::Internal::GetImplementation( control ); Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get( internalControl ); diff --git a/dali-toolkit/devel-api/controls/control-devel.h b/dali-toolkit/devel-api/controls/control-devel.h index 4f7a9aa..9a9e27e 100755 --- a/dali-toolkit/devel-api/controls/control-devel.h +++ b/dali-toolkit/devel-api/controls/control-devel.h @@ -23,7 +23,7 @@ // INTERNAL INCLUDES #include #include -#include +#include namespace Dali { @@ -275,14 +275,14 @@ DALI_TOOLKIT_API void SetInputMethodContext( Internal::Control& control, InputMe * * @return A handle to the layout, or empty. */ -DALI_TOOLKIT_API Toolkit::LayoutBase GetLayout( Internal::Control& control ); +DALI_TOOLKIT_API Toolkit::LayoutItem GetLayout( Internal::Control& control ); /* * @brief Get the layout associated with a control, if any. * * @return A handle to the layout, or empty. */ -DALI_TOOLKIT_API Toolkit::LayoutBase GetLayout( Control control ); +DALI_TOOLKIT_API Toolkit::LayoutItem GetLayout( Control control ); /** * @brief Set the layout on this control. @@ -290,7 +290,7 @@ DALI_TOOLKIT_API Toolkit::LayoutBase GetLayout( Control control ); * @param[in] control The internal Control to set the layout on * @param[in] layout Pointer to the layout */ -DALI_TOOLKIT_API void SetLayout( Internal::Control& control, Toolkit::LayoutBase layout ); +DALI_TOOLKIT_API void SetLayout( Internal::Control& control, Toolkit::LayoutItem layout ); /** * @brief Set the layout on a control. @@ -298,7 +298,7 @@ DALI_TOOLKIT_API void SetLayout( Internal::Control& control, Toolkit::LayoutBase * @param[in] control The Control to set the layout on * @param[in] layout Pointer to the layout */ -DALI_TOOLKIT_API void SetLayout( Control control, Toolkit::LayoutBase layout ); +DALI_TOOLKIT_API void SetLayout( Control control, Toolkit::LayoutItem layout ); } // namespace DevelControl diff --git a/dali-toolkit/devel-api/file.list b/dali-toolkit/devel-api/file.list index e856374..674bcd1 100755 --- a/dali-toolkit/devel-api/file.list +++ b/dali-toolkit/devel-api/file.list @@ -33,8 +33,8 @@ devel_api_src_files = \ $(devel_api_src_dir)/image-loader/texture-manager.cpp \ $(devel_api_src_dir)/layouting/hbox-layout.cpp \ $(devel_api_src_dir)/layouting/vbox-layout.cpp \ - $(devel_api_src_dir)/layouting/layout-base.cpp \ - $(devel_api_src_dir)/layouting/layout-base-impl.cpp \ + $(devel_api_src_dir)/layouting/layout-item.cpp \ + $(devel_api_src_dir)/layouting/layout-item-impl.cpp \ $(devel_api_src_dir)/layouting/layout-controller.cpp \ $(devel_api_src_dir)/layouting/layout-group.cpp \ $(devel_api_src_dir)/layouting/layout-group-impl.cpp \ @@ -82,13 +82,15 @@ devel_api_layouting_header_files = \ $(devel_api_src_dir)/layouting/child-layout-data.h \ $(devel_api_src_dir)/layouting/hbox-layout.h \ $(devel_api_src_dir)/layouting/vbox-layout.h \ - $(devel_api_src_dir)/layouting/layout-base.h \ - $(devel_api_src_dir)/layouting/layout-base-impl.h \ + $(devel_api_src_dir)/layouting/layout-item.h \ + $(devel_api_src_dir)/layouting/layout-item-impl.h \ $(devel_api_src_dir)/layouting/layout-controller.h \ $(devel_api_src_dir)/layouting/layout-group.h \ $(devel_api_src_dir)/layouting/layout-group-impl.h \ $(devel_api_src_dir)/layouting/layout-length.h \ $(devel_api_src_dir)/layouting/layout-size.h \ + $(devel_api_src_dir)/layouting/measured-size.h \ + $(devel_api_src_dir)/layouting/layout-parent-impl.h \ $(devel_api_src_dir)/layouting/measure-spec.h devel_api_magnifier_header_files = \ diff --git a/dali-toolkit/devel-api/layouting/layout-controller.cpp b/dali-toolkit/devel-api/layouting/layout-controller.cpp index 7c1b402..645fe48 100644 --- a/dali-toolkit/devel-api/layouting/layout-controller.cpp +++ b/dali-toolkit/devel-api/layouting/layout-controller.cpp @@ -66,7 +66,7 @@ LayoutController LayoutController::Get() return layoutController; } -void LayoutController::RequestLayout( LayoutBase layout ) +void LayoutController::RequestLayout( LayoutItem layout ) { GetImpl(*this).RequestLayout( GetImplementation( layout ) ); } diff --git a/dali-toolkit/devel-api/layouting/layout-controller.h b/dali-toolkit/devel-api/layouting/layout-controller.h index 96d44f0..db5cc5b 100644 --- a/dali-toolkit/devel-api/layouting/layout-controller.h +++ b/dali-toolkit/devel-api/layouting/layout-controller.h @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include namespace Dali @@ -65,7 +65,7 @@ public: * @brief Request for a particular layout (wrapping a control or a visual) to be measured and laid out. * @param[in] layout The layout to measure & relayout. */ - void RequestLayout( LayoutBase layout ); + void RequestLayout( LayoutItem layout ); public: /// @cond internal diff --git a/dali-toolkit/devel-api/layouting/layout-group-impl.cpp b/dali-toolkit/devel-api/layouting/layout-group-impl.cpp index 844e35a..21fb391 100644 --- a/dali-toolkit/devel-api/layouting/layout-group-impl.cpp +++ b/dali-toolkit/devel-api/layouting/layout-group-impl.cpp @@ -44,9 +44,11 @@ LayoutGroup::LayoutGroup() LayoutGroup::~LayoutGroup() { + // An object with a unique_ptr to an opaque structure must define it's destructor in the translation unit + // where the opaque structure is defined. It cannot use the default method in the header file. } -Toolkit::LayoutGroup::LayoutId LayoutGroup::Add( LayoutBase& child ) +Toolkit::LayoutGroup::LayoutId LayoutGroup::Add( LayoutItem& child ) { LayoutParent* oldParent = child.GetParent(); if( oldParent ) @@ -65,10 +67,10 @@ Toolkit::LayoutGroup::LayoutId LayoutGroup::Add( LayoutBase& child ) auto owner = child.GetOwner(); - // If the owner does not have any LayoutBase child properties, add them - if( ! DevelHandle::DoesCustomPropertyExist( owner, Toolkit::LayoutBase::ChildProperty::WIDTH_SPECIFICATION ) ) + // If the owner does not have any LayoutItem child properties, add them + if( ! DevelHandle::DoesCustomPropertyExist( owner, Toolkit::LayoutItem::ChildProperty::WIDTH_SPECIFICATION ) ) { - // Set default properties for LayoutGroup and LayoutBase. + // Set default properties for LayoutGroup and LayoutItem. // Deriving classes can override OnChildAdd() to add their own default properties GenerateDefaultChildPropertyValues( owner ); } @@ -98,7 +100,7 @@ void LayoutGroup::Remove( Toolkit::LayoutGroup::LayoutId childId ) RequestLayout(); } -void LayoutGroup::Remove( LayoutBase& child ) +void LayoutGroup::Remove( LayoutItem& child ) { for( auto iter = mImpl->mChildren.begin() ; iter != mImpl->mChildren.end() ; ++iter ) { @@ -126,13 +128,13 @@ unsigned int LayoutGroup::GetChildCount() const return mImpl->mChildren.size(); } -LayoutBasePtr LayoutGroup::GetChildAt( unsigned int index ) const +LayoutItemPtr LayoutGroup::GetChildAt( unsigned int index ) const { DALI_ASSERT_ALWAYS( index < mImpl->mChildren.size() ); return mImpl->mChildren[ index ].child; } -LayoutBasePtr LayoutGroup::GetChild( Toolkit::LayoutGroup::LayoutId childId ) const +LayoutItemPtr LayoutGroup::GetChild( Toolkit::LayoutGroup::LayoutId childId ) const { for( auto&& childLayout : mImpl->mChildren ) { @@ -144,7 +146,7 @@ LayoutBasePtr LayoutGroup::GetChild( Toolkit::LayoutGroup::LayoutId childId ) co return NULL; } -Toolkit::LayoutGroup::LayoutId LayoutGroup::GetChildId( LayoutBase& child ) const +Toolkit::LayoutGroup::LayoutId LayoutGroup::GetChildId( LayoutItem& child ) const { for( auto&& childLayout : mImpl->mChildren ) { @@ -156,11 +158,11 @@ Toolkit::LayoutGroup::LayoutId LayoutGroup::GetChildId( LayoutBase& child ) cons return Toolkit::LayoutGroup::UNKNOWN_ID; } -void LayoutGroup::OnChildAdd( LayoutBase& child ) +void LayoutGroup::OnChildAdd( LayoutItem& child ) { } -void LayoutGroup::OnChildRemove( LayoutBase& child ) +void LayoutGroup::OnChildRemove( LayoutItem& child ) { } @@ -183,9 +185,9 @@ void LayoutGroup::OnSetChildProperties( Handle& handle, Property::Index index, P void LayoutGroup::GenerateDefaultChildPropertyValues( Handle child ) { - child.SetProperty( Toolkit::LayoutBase::ChildProperty::WIDTH_SPECIFICATION, + child.SetProperty( Toolkit::LayoutItem::ChildProperty::WIDTH_SPECIFICATION, Toolkit::ChildLayoutData::WRAP_CONTENT ); - child.SetProperty( Toolkit::LayoutBase::ChildProperty::HEIGHT_SPECIFICATION, + child.SetProperty( Toolkit::LayoutItem::ChildProperty::HEIGHT_SPECIFICATION, Toolkit::ChildLayoutData::WRAP_CONTENT ); child.SetProperty( Toolkit::LayoutGroup::ChildProperty::MARGIN_SPECIFICATION, Extents() ); } @@ -201,13 +203,13 @@ void LayoutGroup::MeasureChildren( MeasureSpec widthMeasureSpec, MeasureSpec hei } } -void LayoutGroup::MeasureChild( LayoutBasePtr child, +void LayoutGroup::MeasureChild( LayoutItemPtr child, MeasureSpec parentWidthMeasureSpec, MeasureSpec parentHeightMeasureSpec ) { auto childOwner = child->GetOwner(); - auto desiredWidth = childOwner.GetProperty( Toolkit::LayoutBase::ChildProperty::WIDTH_SPECIFICATION ); - auto desiredHeight = childOwner.GetProperty( Toolkit::LayoutBase::ChildProperty::HEIGHT_SPECIFICATION ); + auto desiredWidth = childOwner.GetProperty( Toolkit::LayoutItem::ChildProperty::WIDTH_SPECIFICATION ); + auto desiredHeight = childOwner.GetProperty( Toolkit::LayoutItem::ChildProperty::HEIGHT_SPECIFICATION ); auto padding = GetPadding(); @@ -221,13 +223,13 @@ void LayoutGroup::MeasureChild( LayoutBasePtr child, child->Measure( childWidthMeasureSpec, childHeightMeasureSpec ); } -void LayoutGroup::MeasureChildWithMargins( LayoutBasePtr child, +void LayoutGroup::MeasureChildWithMargins( LayoutItemPtr child, MeasureSpec parentWidthMeasureSpec, LayoutLength widthUsed, MeasureSpec parentHeightMeasureSpec, LayoutLength heightUsed) { auto childOwner = child->GetOwner(); - auto desiredWidth = childOwner.GetProperty( Toolkit::LayoutBase::ChildProperty::WIDTH_SPECIFICATION ); - auto desiredHeight = childOwner.GetProperty( Toolkit::LayoutBase::ChildProperty::HEIGHT_SPECIFICATION ); + auto desiredWidth = childOwner.GetProperty( Toolkit::LayoutItem::ChildProperty::WIDTH_SPECIFICATION ); + auto desiredHeight = childOwner.GetProperty( Toolkit::LayoutItem::ChildProperty::HEIGHT_SPECIFICATION ); auto desiredMargin = childOwner.GetProperty( Toolkit::LayoutGroup::ChildProperty::MARGIN_SPECIFICATION ); auto padding = GetPadding(); @@ -319,14 +321,14 @@ MeasureSpec LayoutGroup::GetChildMeasureSpec( if (childDimension == Toolkit::ChildLayoutData::MATCH_PARENT) { // Child wants to be our size... find out how big it should be - resultSize = LayoutBase::Impl::sUseZeroUnspecifiedMeasureSpec ? LayoutLength(0) : size; + resultSize = LayoutItem::Impl::sUseZeroUnspecifiedMeasureSpec ? LayoutLength(0) : size; resultMode = MeasureSpec::Mode::UNSPECIFIED; } else if (childDimension == Toolkit::ChildLayoutData::WRAP_CONTENT) { // Child wants to determine its own size.... find out how big // it should be - resultSize = LayoutBase::Impl::sUseZeroUnspecifiedMeasureSpec ? LayoutLength(0) : size; + resultSize = LayoutItem::Impl::sUseZeroUnspecifiedMeasureSpec ? LayoutLength(0) : size; resultMode = MeasureSpec::Mode::UNSPECIFIED; } else @@ -387,7 +389,7 @@ void LayoutGroup::OnUnparent() void LayoutGroup::ChildAddedToOwner( Actor child ) { - LayoutBasePtr childLayout; + LayoutItemPtr childLayout; Toolkit::Control control = Toolkit::Control::DownCast( child ); if( control ) // Can only support adding Controls, not Actors to layout @@ -398,16 +400,16 @@ void LayoutGroup::ChildAddedToOwner( Actor child ) if( ! childLayout ) { - // If the child doesn't already have a layout, then create a LayoutBase for it. - childLayout = LayoutBase::New( control ); + // If the child doesn't already have a layout, then create a LayoutItem for it. + childLayout = LayoutItem::New( control ); childLayout->SetAnimateLayout( IsLayoutAnimated() ); // @todo this essentially forces animation inheritance. Bad? auto desiredSize = control.GetNaturalSize(); childControlDataImpl.SetLayout( *childLayout.Get() ); // HBoxLayout will apply default layout data for this object - child.SetProperty( Toolkit::LayoutBase::ChildProperty::WIDTH_SPECIFICATION, LayoutLength::IntType( desiredSize.width ) ); - child.SetProperty( Toolkit::LayoutBase::ChildProperty::HEIGHT_SPECIFICATION, LayoutLength::IntType( desiredSize.height ) ); + child.SetProperty( Toolkit::LayoutItem::ChildProperty::WIDTH_SPECIFICATION, LayoutLength::IntType( desiredSize.width ) ); + child.SetProperty( Toolkit::LayoutItem::ChildProperty::HEIGHT_SPECIFICATION, LayoutLength::IntType( desiredSize.height ) ); child.SetProperty( Toolkit::LayoutGroup::ChildProperty::MARGIN_SPECIFICATION, Extents() ); } diff --git a/dali-toolkit/devel-api/layouting/layout-group-impl.h b/dali-toolkit/devel-api/layouting/layout-group-impl.h index 5e98dd6..025950c 100644 --- a/dali-toolkit/devel-api/layouting/layout-group-impl.h +++ b/dali-toolkit/devel-api/layouting/layout-group-impl.h @@ -23,7 +23,7 @@ #include #include #include -#include +#include namespace Dali { @@ -38,7 +38,7 @@ using LayoutGroupPtr = IntrusivePtr; /** * LayoutGroup is an abstract class that provides child layout management and basic measuring and layouting. * - * Deriving classes should override LayoutBase::DoInitialize for second stage initialization, + * Deriving classes should override LayoutItem::DoInitialize for second stage initialization, * LayoutGroup::DoRegisterChildProperties to register child property types with the owner, * LayoutGroup::OnChildAdd to apply default child property values to the child. * Deriving classes may override LayoutGroup::OnChildRemove. @@ -46,7 +46,7 @@ using LayoutGroupPtr = IntrusivePtr; * Deriving classes must also override OnMeasure and OnLayout as follows: * * OnMeasure should measure each child using LayoutGroup::MeasureChildWithMargins or LayoutGroup::MeasureChild. - * We recommend calling LayoutBase::ResolveSizeAndState() to resolve measure specs. + * We recommend calling LayoutItem::ResolveSizeAndState() to resolve measure specs. * If some children don't fit, then they can be measured again with different MeasureSpecs as required. * * After measurement, the derived class must also call SetMeasuredDimensions to set it's own requested size. @@ -54,7 +54,7 @@ using LayoutGroupPtr = IntrusivePtr; * OnLayout should use it's own layout parameters and the measured children's size to determine the children's * position and size; it should then call Layout() on the child layout to layout the child and it's hierarchy. */ -class DALI_IMPORT_API LayoutGroup : public LayoutBase, +class DALI_IMPORT_API LayoutGroup : public LayoutItem, public ConnectionTracker { public: @@ -79,7 +79,7 @@ public: * @param[in] layoutChild The child to add * @return The layout id of this child. */ - Toolkit::LayoutGroup::LayoutId Add( LayoutBase& layoutChild ); + Toolkit::LayoutGroup::LayoutId Add( LayoutItem& layoutChild ); /** * @brief Remove a layout child from this group. @@ -91,7 +91,7 @@ public: * @brief Remove a layout child from this group * @param[in] child The layout child */ - void Remove( LayoutBase& child ); + void Remove( LayoutItem& child ); /** * @brief Remove all layout children. @@ -111,12 +111,12 @@ public: /** * Get the child layout at the given index */ - LayoutBasePtr GetChildAt( unsigned int childIndex ) const; + LayoutItemPtr GetChildAt( unsigned int childIndex ) const; /** * Get the child layout id of the given child */ - Toolkit::LayoutGroup::LayoutId GetChildId( LayoutBase& child ) const; + Toolkit::LayoutGroup::LayoutId GetChildId( LayoutItem& child ) const; /** * @brief Get the layout child with the given layout id. @@ -124,21 +124,21 @@ public: * @param[in] childId the layout id of the child within this group * @return A pointer to the child layout */ - LayoutBasePtr GetChild( Toolkit::LayoutGroup::LayoutId childId ) const; + LayoutItemPtr GetChild( Toolkit::LayoutGroup::LayoutId childId ) const; template - LayoutBasePtr GetChild( T childId ) = delete; // Prevent implicit casting of int/uint to LayoutId + LayoutItemPtr GetChild( T childId ) = delete; // Prevent implicit casting of int/uint to LayoutId /** * Callback when child is added to container. * Derived classes can use this to set their own child properties on the child layout's owner. */ - virtual void OnChildAdd( LayoutBase& child ); + virtual void OnChildAdd( LayoutItem& child ); /** * Callback when child is removed from container. */ - virtual void OnChildRemove( LayoutBase& child ); + virtual void OnChildRemove( LayoutItem& child ); /** * @brief Calculate the right measure spec for this child. @@ -205,7 +205,7 @@ protected: * @param parentWidthMeasureSpec The width requirements for this view * @param parentHeightMeasureSpec The height requirements for this view */ - virtual void MeasureChild( LayoutBasePtr child, MeasureSpec parentWidthMeasureSpec, MeasureSpec parentHeightMeasureSpec ); + virtual void MeasureChild( LayoutItemPtr child, MeasureSpec parentWidthMeasureSpec, MeasureSpec parentHeightMeasureSpec ); /** * Ask one of the children of this view to measure itself, taking into @@ -221,7 +221,7 @@ protected: * @param heightUsed Extra space that has been used up by the parent * vertically (possibly by other children of the parent) */ - virtual void MeasureChildWithMargins( LayoutBasePtr child, + virtual void MeasureChildWithMargins( LayoutItemPtr child, MeasureSpec parentWidthMeasureSpec, LayoutLength widthUsed, MeasureSpec parentHeightMeasureSpec, @@ -235,12 +235,12 @@ private: void OnInitialize() override final; /** - * @copydoc LayoutBase::OnRegisterChildProperties() + * @copydoc LayoutItem::OnRegisterChildProperties() */ void OnRegisterChildProperties( const std::string& containerType ) override final; /** - * @copydoc LayoutBase::OnUnparent + * @copydoc LayoutItem::OnUnparent */ void OnUnparent() override final; diff --git a/dali-toolkit/devel-api/layouting/layout-group.cpp b/dali-toolkit/devel-api/layouting/layout-group.cpp index d069bc0..dd36ddc 100644 --- a/dali-toolkit/devel-api/layouting/layout-group.cpp +++ b/dali-toolkit/devel-api/layouting/layout-group.cpp @@ -23,11 +23,11 @@ namespace Toolkit { LayoutGroup::LayoutGroup() -: LayoutBase() +: LayoutItem() { } -LayoutGroup::LayoutId LayoutGroup::Add( LayoutBase& child ) +LayoutGroup::LayoutId LayoutGroup::Add( LayoutItem& child ) { return GetImplementation( *this ).Add( GetImplementation(child) ); } @@ -37,21 +37,21 @@ void LayoutGroup::Remove( LayoutGroup::LayoutId childId ) GetImplementation( *this ).Remove( childId ); } -void LayoutGroup::Remove( LayoutBase& child ) +void LayoutGroup::Remove( LayoutItem& child ) { GetImplementation( *this ).Remove( GetImplementation(child) ); } -LayoutBase LayoutGroup::GetChild( LayoutGroup::LayoutId childId ) const +LayoutItem LayoutGroup::GetChild( LayoutGroup::LayoutId childId ) const { - Internal::LayoutBasePtr child = GetImplementation( *this ).GetChild( childId ); - return LayoutBase( child.Get() ); + Internal::LayoutItemPtr child = GetImplementation( *this ).GetChild( childId ); + return LayoutItem( child.Get() ); } -LayoutBase LayoutGroup::GetChildAt( unsigned int childId ) const +LayoutItem LayoutGroup::GetChildAt( unsigned int childId ) const { - Internal::LayoutBasePtr child = GetImplementation( *this ).GetChildAt( childId ); - return LayoutBase( child.Get() ); + Internal::LayoutItemPtr child = GetImplementation( *this ).GetChildAt( childId ); + return LayoutItem( child.Get() ); } unsigned int LayoutGroup::GetChildCount() const @@ -60,7 +60,7 @@ unsigned int LayoutGroup::GetChildCount() const } LayoutGroup::LayoutGroup( Internal::LayoutGroup* layoutGroup ) -: LayoutBase( layoutGroup ) +: LayoutItem( layoutGroup ) { } diff --git a/dali-toolkit/devel-api/layouting/layout-group.h b/dali-toolkit/devel-api/layouting/layout-group.h index afcf2a9..d006775 100644 --- a/dali-toolkit/devel-api/layouting/layout-group.h +++ b/dali-toolkit/devel-api/layouting/layout-group.h @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include namespace Dali @@ -34,7 +34,7 @@ class LayoutGroup; /** - * A layout that has layout children. Implements LayoutBase. + * A layout that has layout children. Implements LayoutItem. * It can both layout it's children, and be laid out by a parent container. * * A layout group automatically handles adding a Control container's children to itself, @@ -48,7 +48,7 @@ class LayoutGroup; * To write a new layout, inherit from both LayoutGroup handle and Internal::LayoutGroup body. * */ -class DALI_IMPORT_API LayoutGroup : public LayoutBase +class DALI_IMPORT_API LayoutGroup : public LayoutItem { public: using LayoutId = unsigned int; @@ -112,7 +112,7 @@ public: * @param[in] childLayout The layout to add. * @return an Id of the child. */ - LayoutId Add( LayoutBase& childLayout ); + LayoutId Add( LayoutItem& childLayout ); /** * @brief Add a child layout to the layout group @@ -126,14 +126,14 @@ public: * * @param[in] childLayout The layout to remove. */ - void Remove( LayoutBase& childLayout ); + void Remove( LayoutItem& childLayout ); /** * @brief Get the child at the given index. * * @param[in] index The index of the child. */ - LayoutBase GetChildAt( unsigned int index ) const; + LayoutItem GetChildAt( unsigned int index ) const; /** * @brief Get the count of the children of the layout @@ -148,13 +148,13 @@ public: * @param[in] childId The id of the child to get * @return A handle to the child layout, or empty if not found */ - LayoutBase GetChild( LayoutId childId ) const ; + LayoutItem GetChild( LayoutId childId ) const ; /** * Delete template method to remove implicit casting to integer types. */ template - LayoutBase GetChild( T childId ) = delete; + LayoutItem GetChild( T childId ) = delete; public: /// @cond internal diff --git a/dali-toolkit/devel-api/layouting/layout-base-impl.cpp b/dali-toolkit/devel-api/layouting/layout-item-impl.cpp similarity index 78% rename from dali-toolkit/devel-api/layouting/layout-base-impl.cpp rename to dali-toolkit/devel-api/layouting/layout-item-impl.cpp index ebc4bcc..f6bd7f8 100644 --- a/dali-toolkit/devel-api/layouting/layout-base-impl.cpp +++ b/dali-toolkit/devel-api/layouting/layout-item-impl.cpp @@ -19,8 +19,8 @@ #include #include #include -#include -#include +#include +#include #if defined(DEBUG_ENABLED) Debug::Filter* gLayoutFilter = Debug::Filter::New( Debug::Verbose, false, "LOG_LAYOUT" ); @@ -41,19 +41,25 @@ namespace Toolkit namespace Internal { -LayoutBase::LayoutBase() -: mImpl( new LayoutBase::Impl() ), +LayoutItem::LayoutItem() +: mImpl( new LayoutItem::Impl() ), mSlotDelegate( this ) { } -LayoutBasePtr LayoutBase::New( Handle& owner ) +LayoutItem::~LayoutItem() { - LayoutBasePtr layoutPtr = new LayoutBase(); + // An object with a unique_ptr to an opaque structure must define it's destructor in the translation unit + // where the opaque structure is defined. It cannot use the default method in the header file. +} + +LayoutItemPtr LayoutItem::New( Handle& owner ) +{ + LayoutItemPtr layoutPtr = new LayoutItem(); return layoutPtr; } -void LayoutBase::Initialize( Handle& owner, const std::string& containerType ) +void LayoutItem::Initialize( Handle& owner, const std::string& containerType ) { mImpl->mOwner = &(owner.GetBaseObject()); RegisterChildProperties( containerType ); @@ -61,12 +67,12 @@ void LayoutBase::Initialize( Handle& owner, const std::string& containerType ) RequestLayout(); } -Handle LayoutBase::GetOwner() const +Handle LayoutItem::GetOwner() const { return Handle::DownCast(BaseHandle(mImpl->mOwner)); } -void LayoutBase::Unparent() +void LayoutItem::Unparent() { // Enable directly derived types to first remove children OnUnparent(); @@ -75,17 +81,17 @@ void LayoutBase::Unparent() mImpl->mOwner = NULL; } -void LayoutBase::SetAnimateLayout( bool animateLayout ) +void LayoutItem::SetAnimateLayout( bool animateLayout ) { mImpl->mAnimated = animateLayout; } -bool LayoutBase::IsLayoutAnimated() const +bool LayoutItem::IsLayoutAnimated() const { return mImpl->mAnimated; } -void LayoutBase::RegisterChildProperties( const std::string& containerType ) +void LayoutItem::RegisterChildProperties( const std::string& containerType ) { // Call on derived types auto typeInfo = TypeRegistry::Get().GetTypeInfo( containerType ); @@ -94,26 +100,26 @@ void LayoutBase::RegisterChildProperties( const std::string& containerType ) Property::IndexContainer indices; typeInfo.GetChildPropertyIndices( indices ); - if( std::find( indices.Begin(), indices.End(), Toolkit::LayoutBase::ChildProperty::WIDTH_SPECIFICATION ) == + if( std::find( indices.Begin(), indices.End(), Toolkit::LayoutItem::ChildProperty::WIDTH_SPECIFICATION ) == indices.End() ) { ChildPropertyRegistration( typeInfo.GetName(), WIDTH_SPECIFICATION_NAME, - Toolkit::LayoutBase::ChildProperty::WIDTH_SPECIFICATION, Property::INTEGER ); + Toolkit::LayoutItem::ChildProperty::WIDTH_SPECIFICATION, Property::INTEGER ); ChildPropertyRegistration( typeInfo.GetName(), HEIGHT_SPECIFICATION_NAME, - Toolkit::LayoutBase::ChildProperty::HEIGHT_SPECIFICATION, Property::INTEGER ); + Toolkit::LayoutItem::ChildProperty::HEIGHT_SPECIFICATION, Property::INTEGER ); } OnRegisterChildProperties( containerType ); } } -void LayoutBase::OnRegisterChildProperties( const std::string& containerType ) +void LayoutItem::OnRegisterChildProperties( const std::string& containerType ) { } -void LayoutBase::Measure( MeasureSpec widthMeasureSpec, MeasureSpec heightMeasureSpec ) +void LayoutItem::Measure( MeasureSpec widthMeasureSpec, MeasureSpec heightMeasureSpec ) { const bool forceLayout = mImpl->GetPrivateFlag( Impl::PRIVATE_FLAG_FORCE_LAYOUT ); @@ -161,7 +167,7 @@ void LayoutBase::Measure( MeasureSpec widthMeasureSpec, MeasureSpec heightMeasur //mMeasureCache.put(key, ((long) mMeasuredWidth) << 32 | (long) mMeasuredHeight & 0xffffffffL); // suppress sign extension } -void LayoutBase::Layout( LayoutLength l, LayoutLength t, LayoutLength r, LayoutLength b ) +void LayoutItem::Layout( LayoutLength l, LayoutLength t, LayoutLength r, LayoutLength b ) { if( mImpl->GetPrivateFlag( Impl::PRIVATE_FLAG_MEASURE_NEEDED_BEFORE_LAYOUT ) ) { @@ -181,34 +187,34 @@ void LayoutBase::Layout( LayoutLength l, LayoutLength t, LayoutLength r, LayoutL mImpl->SetPrivateFlag( Impl::PRIVATE_FLAG_IS_LAID_OUT ); } -LayoutLength LayoutBase::GetMinimumWidth() const +LayoutLength LayoutItem::GetMinimumWidth() const { return mImpl->mMinimumSize.GetWidth(); } -LayoutLength LayoutBase::GetMinimumHeight() const +LayoutLength LayoutItem::GetMinimumHeight() const { return mImpl->mMinimumSize.GetHeight(); } -void LayoutBase::SetMinimumWidth( LayoutLength minimumWidth ) +void LayoutItem::SetMinimumWidth( LayoutLength minimumWidth ) { mImpl->mMinimumSize.SetWidth( minimumWidth ); RequestLayout(); } -void LayoutBase::SetMinimumHeight( LayoutLength minimumHeight ) +void LayoutItem::SetMinimumHeight( LayoutLength minimumHeight ) { mImpl->mMinimumSize.SetHeight( minimumHeight ); RequestLayout(); } -Extents LayoutBase::GetPadding() const +Extents LayoutItem::GetPadding() const { return mImpl->mPadding; } -LayoutLength LayoutBase::GetDefaultSize( LayoutLength size, MeasureSpec measureSpec ) +LayoutLength LayoutItem::GetDefaultSize( LayoutLength size, MeasureSpec measureSpec ) { LayoutLength result = size; auto specMode = measureSpec.GetMode(); @@ -231,63 +237,63 @@ LayoutLength LayoutBase::GetDefaultSize( LayoutLength size, MeasureSpec measureS return result; } -void LayoutBase::OnMeasure( MeasureSpec widthMeasureSpec, MeasureSpec heightMeasureSpec) +void LayoutItem::OnMeasure( MeasureSpec widthMeasureSpec, MeasureSpec heightMeasureSpec) { SetMeasuredDimensions( GetDefaultSize( GetSuggestedMinimumWidth(), widthMeasureSpec ), GetDefaultSize( GetSuggestedMinimumHeight(), heightMeasureSpec ) ); } -void LayoutBase::OnLayout( bool changed, LayoutLength left, LayoutLength top, LayoutLength right, LayoutLength bottom ) +void LayoutItem::OnLayout( bool changed, LayoutLength left, LayoutLength top, LayoutLength right, LayoutLength bottom ) { } -LayoutParent* LayoutBase::GetParent() +LayoutParent* LayoutItem::GetParent() { return mImpl->mLayoutParent; } -void LayoutBase::RequestLayout() +void LayoutItem::RequestLayout() { // @todo Enforce failure if called in Measure/Layout passes. mImpl->SetPrivateFlag( Impl::PRIVATE_FLAG_FORCE_LAYOUT ); Toolkit::LayoutController layoutController = Toolkit::LayoutController::Get(); - layoutController.RequestLayout( Toolkit::LayoutBase(this) ); + layoutController.RequestLayout( Toolkit::LayoutItem(this) ); } -bool LayoutBase::IsLayoutRequested() const +bool LayoutItem::IsLayoutRequested() const { return mImpl->GetPrivateFlag( Impl::PRIVATE_FLAG_FORCE_LAYOUT ); } -void LayoutBase::SetMeasuredDimensions( MeasuredSize measuredWidth, MeasuredSize measuredHeight ) +void LayoutItem::SetMeasuredDimensions( MeasuredSize measuredWidth, MeasuredSize measuredHeight ) { mImpl->SetPrivateFlag( Impl::PRIVATE_FLAG_MEASURED_DIMENSION_SET ); mImpl->mMeasuredWidth = measuredWidth; mImpl->mMeasuredHeight = measuredHeight; } -LayoutLength LayoutBase::GetMeasuredWidth() const +LayoutLength LayoutItem::GetMeasuredWidth() const { // Get the size portion of the measured width return mImpl->mMeasuredWidth.GetSize(); } -LayoutLength LayoutBase::GetMeasuredHeight() const +LayoutLength LayoutItem::GetMeasuredHeight() const { return mImpl->mMeasuredHeight.GetSize(); } -MeasuredSize LayoutBase::GetMeasuredWidthAndState() const +MeasuredSize LayoutItem::GetMeasuredWidthAndState() const { return mImpl->mMeasuredWidth; } -MeasuredSize LayoutBase::GetMeasuredHeightAndState() const +MeasuredSize LayoutItem::GetMeasuredHeightAndState() const { return mImpl->mMeasuredHeight; } -LayoutLength LayoutBase::GetSuggestedMinimumWidth() const +LayoutLength LayoutItem::GetSuggestedMinimumWidth() const { auto owner = GetOwner(); auto actor = Actor::DownCast(owner); @@ -296,7 +302,7 @@ LayoutLength LayoutBase::GetSuggestedMinimumWidth() const return std::max( mImpl->mMinimumSize.GetWidth(), LayoutLength::IntType( naturalSize.width ) ); } -LayoutLength LayoutBase::GetSuggestedMinimumHeight() const +LayoutLength LayoutItem::GetSuggestedMinimumHeight() const { auto owner = GetOwner(); auto actor = Actor::DownCast(owner); @@ -305,7 +311,7 @@ LayoutLength LayoutBase::GetSuggestedMinimumHeight() const return std::max( mImpl->mMinimumSize.GetHeight(), LayoutLength::IntType(naturalSize.height) ); } -MeasuredSize LayoutBase::ResolveSizeAndState( LayoutLength size, MeasureSpec measureSpec, MeasuredSize::State childMeasuredState ) +MeasuredSize LayoutItem::ResolveSizeAndState( LayoutLength size, MeasureSpec measureSpec, MeasuredSize::State childMeasuredState ) { auto specMode = measureSpec.GetMode(); LayoutLength specSize = measureSpec.GetSize(); @@ -345,11 +351,11 @@ MeasuredSize LayoutBase::ResolveSizeAndState( LayoutLength size, MeasureSpec mea } -bool LayoutBase::SetFrame( LayoutLength left, LayoutLength top, LayoutLength right, LayoutLength bottom ) +bool LayoutItem::SetFrame( LayoutLength left, LayoutLength top, LayoutLength right, LayoutLength bottom ) { bool changed = false; - DALI_LOG_INFO( gLayoutFilter, Debug::Verbose, "LayoutBase::SetFrame(%d, %d, %d, %d)\n", left.mValue, top.mValue, right.mValue, bottom.mValue ); + DALI_LOG_INFO( gLayoutFilter, Debug::Verbose, "LayoutItem::SetFrame(%d, %d, %d, %d)\n", left.mValue, top.mValue, right.mValue, bottom.mValue ); if( mImpl->mLeft != left || mImpl->mRight != right || mImpl->mTop != top || mImpl->mBottom != bottom ) { @@ -381,7 +387,7 @@ bool LayoutBase::SetFrame( LayoutLength left, LayoutLength top, LayoutLength rig Vector3( float(left.mValue), float(top.mValue), 0.0f ) ); animation.AnimateTo( Property( actor, Actor::Property::SIZE ), Vector3( right-left, bottom-top, 0.0f ) ); - animation.FinishedSignal().Connect( mSlotDelegate, &LayoutBase::OnLayoutAnimationFinished ); + animation.FinishedSignal().Connect( mSlotDelegate, &LayoutItem::OnLayoutAnimationFinished ); animation.Play(); } else @@ -400,7 +406,7 @@ bool LayoutBase::SetFrame( LayoutLength left, LayoutLength top, LayoutLength rig return changed; } -void LayoutBase::OnLayoutAnimationFinished( Animation& animation ) +void LayoutItem::OnLayoutAnimationFinished( Animation& animation ) { auto owner = GetOwner(); auto actor = Actor::DownCast(owner); @@ -410,17 +416,17 @@ void LayoutBase::OnLayoutAnimationFinished( Animation& animation ) } } -void LayoutBase::SizeChange( LayoutSize newSize, LayoutSize oldSize) +void LayoutItem::SizeChange( LayoutSize newSize, LayoutSize oldSize) { OnSizeChanged( newSize, oldSize ); } -void LayoutBase::OnSizeChanged( LayoutSize newSize, LayoutSize oldSize ) +void LayoutItem::OnSizeChanged( LayoutSize newSize, LayoutSize oldSize ) { } -void LayoutBase::OnInitialize() +void LayoutItem::OnInitialize() { } diff --git a/dali-toolkit/devel-api/layouting/layout-base-impl.h b/dali-toolkit/devel-api/layouting/layout-item-impl.h similarity index 93% rename from dali-toolkit/devel-api/layouting/layout-base-impl.h rename to dali-toolkit/devel-api/layouting/layout-item-impl.h index 835d2b1..fb12913 100644 --- a/dali-toolkit/devel-api/layouting/layout-base-impl.h +++ b/dali-toolkit/devel-api/layouting/layout-item-impl.h @@ -1,5 +1,5 @@ -#ifndef DALI_TOOLKIT_INTERNAL_LAYOUTING_LAYOUT_BASE_H -#define DALI_TOOLKIT_INTERNAL_LAYOUTING_LAYOUT_BASE_H +#ifndef DALI_TOOLKIT_INTERNAL_LAYOUTING_LAYOUT_ITEM_H +#define DALI_TOOLKIT_INTERNAL_LAYOUTING_LAYOUT_ITEM_H /* * Copyright (c) 2018 Samsung Electronics Co., Ltd. * @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include @@ -37,27 +37,27 @@ namespace Toolkit namespace Internal { -class LayoutBase; -using LayoutBasePtr = IntrusivePtr; +class LayoutItem; +using LayoutItemPtr = IntrusivePtr; /** * Base class for layouts. */ -class DALI_IMPORT_API LayoutBase : public BaseObject, +class DALI_IMPORT_API LayoutItem : public BaseObject, public LayoutParent { public: /** * Constructor. */ - LayoutBase(); + LayoutItem(); protected: /** * A reference counted object may only be deleted by calling Unreference() */ - ~LayoutBase() = default; + virtual ~LayoutItem(); public: @@ -65,19 +65,19 @@ public: * @brief Construct * * @param[in] owner The owner (container view / child view / visual ) of this layout - * @return a new LayoutBase object + * @return a new LayoutItem object */ - static LayoutBasePtr New( Handle& owner ); + static LayoutItemPtr New( Handle& owner ); /** * @brief Remove the default copy constructor */ - LayoutBase(const LayoutBase& copy)=delete; + LayoutItem(const LayoutItem& copy)=delete; /** * @brief Remove the default assignment operator */ - LayoutBase& operator=(const LayoutBase& rhs)=delete; + LayoutItem& operator=(const LayoutItem& rhs)=delete; /** * @brief Initialize the layout with it's owner and owner's type name @@ -436,26 +436,26 @@ public: private: std::unique_ptr mImpl; ///< Implementation class holds all the data - SlotDelegate mSlotDelegate; + SlotDelegate mSlotDelegate; }; } //namespace Internal -inline Internal::LayoutBase& GetImplementation( Dali::Toolkit::LayoutBase& handle ) +inline Internal::LayoutItem& GetImplementation( Dali::Toolkit::LayoutItem& handle ) { - DALI_ASSERT_ALWAYS( handle && "LayoutBase handle is empty" ); + DALI_ASSERT_ALWAYS( handle && "LayoutItem handle is empty" ); BaseObject& object = handle.GetBaseObject(); - return static_cast< Internal::LayoutBase& >( object ); + return static_cast< Internal::LayoutItem& >( object ); } -inline const Internal::LayoutBase& GetImplementation( const Dali::Toolkit::LayoutBase& handle ) +inline const Internal::LayoutItem& GetImplementation( const Dali::Toolkit::LayoutItem& handle ) { - DALI_ASSERT_ALWAYS( handle && "LayoutBase handle is empty" ); + DALI_ASSERT_ALWAYS( handle && "LayoutItem handle is empty" ); const BaseObject& object = handle.GetBaseObject(); - return static_cast< const Internal::LayoutBase& >( object ); + return static_cast< const Internal::LayoutItem& >( object ); } } //namespace Toolkit } //namespace Dali -#endif // DALI_TOOLKIT_INTERNAL_LAYOUTING_LAYOUT_BASE_H +#endif // DALI_TOOLKIT_INTERNAL_LAYOUTING_LAYOUT_ITEM_H diff --git a/dali-toolkit/devel-api/layouting/layout-base.cpp b/dali-toolkit/devel-api/layouting/layout-item.cpp similarity index 64% rename from dali-toolkit/devel-api/layouting/layout-base.cpp rename to dali-toolkit/devel-api/layouting/layout-item.cpp index 07aa595..153c134 100644 --- a/dali-toolkit/devel-api/layouting/layout-base.cpp +++ b/dali-toolkit/devel-api/layouting/layout-item.cpp @@ -14,41 +14,41 @@ * limitations under the License. */ -#include -#include +#include +#include namespace Dali { namespace Toolkit { -LayoutBase::LayoutBase() +LayoutItem::LayoutItem() : BaseHandle() { } -LayoutBase LayoutBase::New( Handle& handle ) +LayoutItem LayoutItem::New( Handle& handle ) { - Internal::LayoutBasePtr layout = Internal::LayoutBase::New( handle ); - return LayoutBase( layout.Get() ); + Internal::LayoutItemPtr layout = Internal::LayoutItem::New( handle ); + return LayoutItem( layout.Get() ); } -LayoutBase::LayoutBase( Internal::LayoutBase* layoutBase ) -: BaseHandle( layoutBase ) +LayoutItem::LayoutItem( Internal::LayoutItem* LayoutItem ) +: BaseHandle( LayoutItem ) { } -Handle LayoutBase::GetOwner() const +Handle LayoutItem::GetOwner() const { return GetImplementation( *this ).GetOwner(); } -void LayoutBase::SetAnimateLayout( bool animateLayout ) +void LayoutItem::SetAnimateLayout( bool animateLayout ) { GetImplementation( *this ).SetAnimateLayout( animateLayout ); } -bool LayoutBase::IsLayoutAnimated() const +bool LayoutItem::IsLayoutAnimated() const { return GetImplementation( *this ).IsLayoutAnimated(); } diff --git a/dali-toolkit/devel-api/layouting/layout-base.h b/dali-toolkit/devel-api/layouting/layout-item.h similarity index 81% rename from dali-toolkit/devel-api/layouting/layout-base.h rename to dali-toolkit/devel-api/layouting/layout-item.h index 8686f53..3bb96bb 100644 --- a/dali-toolkit/devel-api/layouting/layout-base.h +++ b/dali-toolkit/devel-api/layouting/layout-item.h @@ -1,5 +1,5 @@ -#ifndef DALI_TOOLKIT_LAYOUTING_LAYOUT_BASE_H -#define DALI_TOOLKIT_LAYOUTING_LAYOUT_BASE_H +#ifndef DALI_TOOLKIT_LAYOUTING_LAYOUT_ITEM_H +#define DALI_TOOLKIT_LAYOUTING_LAYOUT_ITEM_H /* * Copyright (c) 2018 Samsung Electronics Co., Ltd. * @@ -32,7 +32,7 @@ namespace Toolkit namespace Internal { -class LayoutBase; +class LayoutItem; } using LayoutId = unsigned int; @@ -42,7 +42,7 @@ using LayoutId = unsigned int; * Base class for layouts. It is used to layout a control (or visual). * It can be laid out by a LayoutGroup. */ -class DALI_IMPORT_API LayoutBase : public BaseHandle +class DALI_IMPORT_API LayoutItem : public BaseHandle { public: @@ -63,35 +63,35 @@ public: }; /** - * @brief Default constructor which provides an uninitialized Dali::LayoutBase. + * @brief Default constructor which provides an uninitialized Dali::LayoutItem. */ - LayoutBase(); + LayoutItem(); /** * @brief Default destructor */ - ~LayoutBase()=default; + ~LayoutItem()=default; /** - * @brief Create an initialized LayoutBase + * @brief Create an initialized LayoutItem * * @param[in] handle A handle to the object that this layout for, e.g. a Control or a Visual::Base * @warning This is an interim function, and will be deleted when all controls have layouts * @todo Ensure that this warning is implemented */ - static LayoutBase New( Handle& handle ); + static LayoutItem New( Handle& handle ); /** * @brief Copy constructor - * @param[in] copy The LayoutBase to copy. + * @param[in] copy The LayoutItem to copy. */ - LayoutBase(const LayoutBase& copy) = default; + LayoutItem(const LayoutItem& copy) = default; /** * @brief Assignment operator - * @param[in] rhs The LayoutBase to copy + * @param[in] rhs The LayoutItem to copy */ - LayoutBase& operator=( const LayoutBase& rhs ) = default; + LayoutItem& operator=( const LayoutItem& rhs ) = default; /** * @brief Get a handle to the control or visual this layout represents. @@ -117,11 +117,11 @@ public: public: /// @cond internal /** - * @brief This constructor is used by LayoutBase::New() methods. + * @brief This constructor is used by LayoutItem::New() methods. * * @param[in] actor A pointer to a newly allocated Dali resource */ - explicit DALI_INTERNAL LayoutBase( Internal::LayoutBase* layoutBase ); + explicit DALI_INTERNAL LayoutItem( Internal::LayoutItem* LayoutItem ); /// @endcond }; @@ -129,4 +129,4 @@ public: }//namespace Toolkit }//namespace Dali -#endif // DALI_TOOLKIT_LAYOUTING_LAYOUT_BASE_H +#endif // DALI_TOOLKIT_LAYOUTING_LAYOUT_ITEM_H diff --git a/dali-toolkit/internal/controls/control/control-data-impl.cpp b/dali-toolkit/internal/controls/control/control-data-impl.cpp index ce2d9b1..e916a0e 100755 --- a/dali-toolkit/internal/controls/control/control-data-impl.cpp +++ b/dali-toolkit/internal/controls/control/control-data-impl.cpp @@ -1422,12 +1422,12 @@ bool Control::Impl::FilterKeyEvent( const KeyEvent& event ) return consumed; } -Toolkit::Internal::LayoutBasePtr Control::Impl::GetLayout() const +Toolkit::Internal::LayoutItemPtr Control::Impl::GetLayout() const { return mLayout; } -void Control::Impl::SetLayout( Toolkit::Internal::LayoutBase& layout ) +void Control::Impl::SetLayout( Toolkit::Internal::LayoutItem& layout ) { if( mLayout ) { diff --git a/dali-toolkit/internal/controls/control/control-data-impl.h b/dali-toolkit/internal/controls/control/control-data-impl.h index 31815f6..2a06d4c 100755 --- a/dali-toolkit/internal/controls/control/control-data-impl.h +++ b/dali-toolkit/internal/controls/control/control-data-impl.h @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include @@ -329,13 +329,13 @@ public: * * @return A pointer to the layout, or NULL. */ - Toolkit::Internal::LayoutBasePtr GetLayout() const; + Toolkit::Internal::LayoutItemPtr GetLayout() const; /** * @brief Set the layout on this control. * @param[in] layout Pointer to the layout */ - void SetLayout( Toolkit::Internal::LayoutBase& layout ); + void SetLayout( Toolkit::Internal::LayoutItem& layout ); private: @@ -383,7 +383,7 @@ public: std::string mSubStateName; // Layout - Toolkit::Internal::LayoutBasePtr mLayout; + Toolkit::Internal::LayoutItemPtr mLayout; int mLeftFocusableActorId; ///< Actor ID of Left focusable control. int mRightFocusableActorId; ///< Actor ID of Right focusable control. diff --git a/dali-toolkit/internal/file.list b/dali-toolkit/internal/file.list index 8064510..00121b8 100755 --- a/dali-toolkit/internal/file.list +++ b/dali-toolkit/internal/file.list @@ -13,7 +13,7 @@ toolkit_src_files = \ $(toolkit_src_dir)/builder/replacement.cpp \ $(toolkit_src_dir)/layouting/hbox-layout-impl.cpp \ $(toolkit_src_dir)/layouting/vbox-layout-impl.cpp \ - $(toolkit_src_dir)/layouting/layout-base-data-impl.cpp \ + $(toolkit_src_dir)/layouting/layout-item-data-impl.cpp \ $(toolkit_src_dir)/layouting/layout-group-data-impl.cpp \ $(toolkit_src_dir)/layouting/layout-controller-debug.cpp \ $(toolkit_src_dir)/layouting/layout-controller-impl.cpp \ diff --git a/dali-toolkit/internal/layouting/hbox-layout-impl.cpp b/dali-toolkit/internal/layouting/hbox-layout-impl.cpp index 181a036..ca86db6 100644 --- a/dali-toolkit/internal/layouting/hbox-layout-impl.cpp +++ b/dali-toolkit/internal/layouting/hbox-layout-impl.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include @@ -75,7 +75,7 @@ void HboxLayout::DoRegisterChildProperties( const std::string& containerType ) } } -void HboxLayout::OnChildAdd( LayoutBase& child ) +void HboxLayout::OnChildAdd( LayoutItem& child ) { auto owner = child.GetOwner(); owner.SetProperty( Toolkit::HboxLayout::ChildProperty::WEIGHT, 1.0f ); @@ -126,7 +126,7 @@ void HboxLayout::OnMeasure( MeasureSpec widthMeasureSpec, MeasureSpec heightMeas if( childLayout ) { auto childOwner = childLayout->GetOwner(); - auto desiredHeight = childOwner.GetProperty( Toolkit::LayoutBase::ChildProperty::HEIGHT_SPECIFICATION ); + auto desiredHeight = childOwner.GetProperty( Toolkit::LayoutItem::ChildProperty::HEIGHT_SPECIFICATION ); MeasureChildWithMargins( childLayout, widthMeasureSpec, 0, heightMeasureSpec, 0 ); auto childWidth = childLayout->GetMeasuredWidth(); @@ -204,23 +204,23 @@ void HboxLayout::ForceUniformHeight( int count, MeasureSpec widthMeasureSpec ) auto uniformMeasureSpec = MeasureSpec( GetMeasuredHeight(), MeasureSpec::Mode::EXACTLY ); for (int i = 0; i < count; ++i) { - LayoutBasePtr childLayout = GetChildAt(i); + LayoutItemPtr childLayout = GetChildAt(i); if( childLayout != nullptr ) { auto childOwner = childLayout->GetOwner(); - auto desiredWidth = childOwner.GetProperty( Toolkit::LayoutBase::ChildProperty::WIDTH_SPECIFICATION ); - auto desiredHeight = childOwner.GetProperty( Toolkit::LayoutBase::ChildProperty::HEIGHT_SPECIFICATION ); + auto desiredWidth = childOwner.GetProperty( Toolkit::LayoutItem::ChildProperty::WIDTH_SPECIFICATION ); + auto desiredHeight = childOwner.GetProperty( Toolkit::LayoutItem::ChildProperty::HEIGHT_SPECIFICATION ); if( desiredHeight == Toolkit::ChildLayoutData::MATCH_PARENT ) { // Temporarily force children to reuse their old measured width int oldWidth = desiredWidth; - childOwner.SetProperty( Toolkit::LayoutBase::ChildProperty::WIDTH_SPECIFICATION, childLayout->GetMeasuredWidth().mValue ); + childOwner.SetProperty( Toolkit::LayoutItem::ChildProperty::WIDTH_SPECIFICATION, childLayout->GetMeasuredWidth().mValue ); // Remeasure with new dimensions MeasureChildWithMargins( childLayout, widthMeasureSpec, 0, uniformMeasureSpec, 0); - childOwner.SetProperty( Toolkit::LayoutBase::ChildProperty::WIDTH_SPECIFICATION, oldWidth ); + childOwner.SetProperty( Toolkit::LayoutItem::ChildProperty::WIDTH_SPECIFICATION, oldWidth ); } } } @@ -259,7 +259,7 @@ void HboxLayout::OnLayout( bool changed, LayoutLength left, LayoutLength top, La for( unsigned int i = 0; i < count; i++) { int childIndex = start + dir * i; - LayoutBasePtr childLayout = GetChildAt( childIndex ); + LayoutItemPtr childLayout = GetChildAt( childIndex ); if( childLayout != nullptr ) { auto childWidth = childLayout->GetMeasuredWidth(); diff --git a/dali-toolkit/internal/layouting/hbox-layout-impl.h b/dali-toolkit/internal/layouting/hbox-layout-impl.h index ea009ae..2057376 100644 --- a/dali-toolkit/internal/layouting/hbox-layout-impl.h +++ b/dali-toolkit/internal/layouting/hbox-layout-impl.h @@ -46,27 +46,27 @@ protected: virtual ~HboxLayout(); /** - * @copydoc LayoutBase::DoInitialize + * @copydoc LayoutItem::DoInitialize */ virtual void DoInitialize() override; /** - * @copydoc LayoutBase::DoRegisterChildProperties() + * @copydoc LayoutItem::DoRegisterChildProperties() */ virtual void DoRegisterChildProperties( const std::string& containerType ) override; /** - * @copydoc LayoutBase::OnChildAdd + * @copydoc LayoutItem::OnChildAdd */ - virtual void OnChildAdd( LayoutBase& child ) override; + virtual void OnChildAdd( LayoutItem& child ) override; /** - * @copydoc LayoutBase::OnMeasure + * @copydoc LayoutItem::OnMeasure */ virtual void OnMeasure( MeasureSpec widthMeasureSpec, MeasureSpec heightMeasureSpec ) override; /** - * @copydoc LayoutBase::OnLayout + * @copydoc LayoutItem::OnLayout */ virtual void OnLayout( bool changed, LayoutLength l, LayoutLength t, LayoutLength r, LayoutLength b ) override; diff --git a/dali-toolkit/internal/layouting/layout-controller-debug.cpp b/dali-toolkit/internal/layouting/layout-controller-debug.cpp index 70838b4..85057c1 100644 --- a/dali-toolkit/internal/layouting/layout-controller-debug.cpp +++ b/dali-toolkit/internal/layouting/layout-controller-debug.cpp @@ -30,7 +30,7 @@ namespace Internal Debug::Filter* gLogFilter = Debug::Filter::New( Debug::Verbose, false, "LOG_LAYOUT_TREE" ); -void GetLayoutMeasureStateString( std::ostringstream& oss, LayoutBasePtr layout ) +void GetLayoutMeasureStateString( std::ostringstream& oss, LayoutItemPtr layout ) { if( layout ) { @@ -43,7 +43,7 @@ void GetLayoutMeasureStateString( std::ostringstream& oss, LayoutBasePtr layout } } -void LayoutDebugMeasureStateRecurseLayout( LayoutBasePtr layout, int depth ); +void LayoutDebugMeasureStateRecurseLayout( LayoutItemPtr layout, int depth ); void LayoutDebugMeasureStateRecurseActor( Actor root, int depth ) { @@ -57,7 +57,7 @@ void LayoutDebugMeasureStateRecurseActor( Actor root, int depth ) { Internal::Control& controlImpl = GetImplementation( control ); Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get( controlImpl ); - LayoutBasePtr layout = controlDataImpl.GetLayout(); + LayoutItemPtr layout = controlDataImpl.GetLayout(); if( layout != nullptr ) { @@ -92,7 +92,7 @@ void LayoutDebugMeasureStateRecurseActor( Actor root, int depth ) } } -void LayoutDebugMeasureStateRecurseLayout( LayoutBasePtr layout, int depth ) +void LayoutDebugMeasureStateRecurseLayout( LayoutItemPtr layout, int depth ) { std::ostringstream oss; for(int i=0;iGetOwner(); - auto widthMeasureSpec = childOwner.GetProperty( Toolkit::LayoutBase::ChildProperty::WIDTH_SPECIFICATION ); - auto heightMeasureSpec = childOwner.GetProperty( Toolkit::LayoutBase::ChildProperty::HEIGHT_SPECIFICATION ); + auto widthMeasureSpec = childOwner.GetProperty( Toolkit::LayoutItem::ChildProperty::WIDTH_SPECIFICATION ); + auto heightMeasureSpec = childOwner.GetProperty( Toolkit::LayoutItem::ChildProperty::HEIGHT_SPECIFICATION ); oss << "LayoutData:" << "( " << widthMeasureSpec << ", " << heightMeasureSpec << ") "; diff --git a/dali-toolkit/internal/layouting/layout-controller-impl.cpp b/dali-toolkit/internal/layouting/layout-controller-impl.cpp index 30beba4..90f125b 100644 --- a/dali-toolkit/internal/layouting/layout-controller-impl.cpp +++ b/dali-toolkit/internal/layouting/layout-controller-impl.cpp @@ -49,13 +49,13 @@ void LayoutController::Initialize() { } -void LayoutController::RequestLayout( LayoutBase& layoutBase ) +void LayoutController::RequestLayout( LayoutItem& LayoutItem ) { DALI_LOG_INFO( gLogFilter, Debug::Concise, "LayoutController::RequestLayout\n" ); mLayoutRequested = true; // Go up the tree and mark all parents to relayout - LayoutParent* layoutParent = layoutBase.GetParent(); + LayoutParent* layoutParent = LayoutItem.GetParent(); if( layoutParent ) { LayoutGroup& layoutGroup = static_cast< LayoutGroup& >( *layoutParent ); @@ -107,7 +107,7 @@ void LayoutController::MeasureHierarchy( Actor root, MeasureSpec widthSpec, Meas { Internal::Control& controlImpl = GetImplementation( control ); Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get( controlImpl ); - LayoutBasePtr layout = controlDataImpl.GetLayout(); + LayoutItemPtr layout = controlDataImpl.GetLayout(); if( layout ) { @@ -132,7 +132,7 @@ void LayoutController::PerformLayout( Actor root, int left, int top, int right, { Internal::Control& controlImpl = GetImplementation( control ); Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get( controlImpl ); - LayoutBasePtr layout = controlDataImpl.GetLayout(); + LayoutItemPtr layout = controlDataImpl.GetLayout(); if( layout ) { diff --git a/dali-toolkit/internal/layouting/layout-controller-impl.h b/dali-toolkit/internal/layouting/layout-controller-impl.h index 4a7bdbc..08db259 100644 --- a/dali-toolkit/internal/layouting/layout-controller-impl.h +++ b/dali-toolkit/internal/layouting/layout-controller-impl.h @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include namespace Dali @@ -56,7 +56,7 @@ public: /** * This marks the given layout and all its parents as dirty. */ - void RequestLayout( LayoutBase& layout ); + void RequestLayout( LayoutItem& layout ); /** * Measures next level of layouts in the actor hierarchy. diff --git a/dali-toolkit/internal/layouting/layout-group-data-impl.h b/dali-toolkit/internal/layouting/layout-group-data-impl.h index f7e05e9..231cc09 100644 --- a/dali-toolkit/internal/layouting/layout-group-data-impl.h +++ b/dali-toolkit/internal/layouting/layout-group-data-impl.h @@ -19,8 +19,8 @@ #include -#include -#include +#include +#include #include namespace Dali @@ -38,7 +38,7 @@ public: public: struct ChildLayout { - LayoutBasePtr child; + LayoutItemPtr child; Toolkit::LayoutGroup::LayoutId layoutId; }; diff --git a/dali-toolkit/internal/layouting/layout-base-data-impl.cpp b/dali-toolkit/internal/layouting/layout-item-data-impl.cpp similarity index 87% rename from dali-toolkit/internal/layouting/layout-base-data-impl.cpp rename to dali-toolkit/internal/layouting/layout-item-data-impl.cpp index 9a1b984..d3b394d 100644 --- a/dali-toolkit/internal/layouting/layout-base-data-impl.cpp +++ b/dali-toolkit/internal/layouting/layout-item-data-impl.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include #include namespace Dali @@ -24,10 +24,10 @@ namespace Toolkit namespace Internal { -bool LayoutBase::Impl::sUseZeroUnspecifiedMeasureSpec = false; +bool LayoutItem::Impl::sUseZeroUnspecifiedMeasureSpec = false; -LayoutBase::Impl::Impl() +LayoutItem::Impl::Impl() : mOwner( nullptr ), mLayoutParent( nullptr ), mOldWidthMeasureSpec( 0u ), diff --git a/dali-toolkit/internal/layouting/layout-base-data-impl.h b/dali-toolkit/internal/layouting/layout-item-data-impl.h similarity index 97% rename from dali-toolkit/internal/layouting/layout-base-data-impl.h rename to dali-toolkit/internal/layouting/layout-item-data-impl.h index fbf4202..3758460 100644 --- a/dali-toolkit/internal/layouting/layout-base-data-impl.h +++ b/dali-toolkit/internal/layouting/layout-item-data-impl.h @@ -17,7 +17,7 @@ * limitations under the License. */ -#include +#include #include #include @@ -30,7 +30,7 @@ namespace Internal class LayoutParent; -class LayoutBase::Impl +class LayoutItem::Impl { public: Impl(); diff --git a/dali-toolkit/internal/layouting/vbox-layout-impl.cpp b/dali-toolkit/internal/layouting/vbox-layout-impl.cpp index ceb42c4..56fb230 100644 --- a/dali-toolkit/internal/layouting/vbox-layout-impl.cpp +++ b/dali-toolkit/internal/layouting/vbox-layout-impl.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include @@ -76,7 +76,7 @@ void VboxLayout::DoRegisterChildProperties( const std::string& containerType ) } } -void VboxLayout::OnChildAdd( LayoutBase& child ) +void VboxLayout::OnChildAdd( LayoutItem& child ) { auto owner = child.GetOwner(); owner.SetProperty( Toolkit::VboxLayout::ChildProperty::WEIGHT, 1.0f ); @@ -128,7 +128,7 @@ void VboxLayout::OnMeasure( MeasureSpec widthMeasureSpec, MeasureSpec heightMeas if( childLayout ) { auto childOwner = childLayout->GetOwner(); - auto desiredWidth = childOwner.GetProperty( Toolkit::LayoutBase::ChildProperty::WIDTH_SPECIFICATION ); + auto desiredWidth = childOwner.GetProperty( Toolkit::LayoutItem::ChildProperty::WIDTH_SPECIFICATION ); MeasureChildWithMargins( childLayout, widthMeasureSpec, 0, heightMeasureSpec, 0 ); auto childHeight = childLayout->GetMeasuredHeight(); @@ -199,23 +199,23 @@ void VboxLayout::ForceUniformWidth( int count, MeasureSpec heightMeasureSpec ) auto uniformMeasureSpec = MeasureSpec( GetMeasuredWidth(), MeasureSpec::Mode::EXACTLY ); for (int i = 0; i < count; ++i) { - LayoutBasePtr childLayout = GetChildAt(i); + LayoutItemPtr childLayout = GetChildAt(i); if( childLayout != nullptr ) { auto childOwner = childLayout->GetOwner(); - auto desiredWidth = childOwner.GetProperty( Toolkit::LayoutBase::ChildProperty::WIDTH_SPECIFICATION ); - auto desiredHeight = childOwner.GetProperty( Toolkit::LayoutBase::ChildProperty::HEIGHT_SPECIFICATION ); + auto desiredWidth = childOwner.GetProperty( Toolkit::LayoutItem::ChildProperty::WIDTH_SPECIFICATION ); + auto desiredHeight = childOwner.GetProperty( Toolkit::LayoutItem::ChildProperty::HEIGHT_SPECIFICATION ); if( desiredWidth == Toolkit::ChildLayoutData::MATCH_PARENT ) { // Temporarily force children to reuse their old measured height int oldHeight = desiredHeight; - childOwner.SetProperty( Toolkit::LayoutBase::ChildProperty::HEIGHT_SPECIFICATION, childLayout->GetMeasuredHeight().mValue ); + childOwner.SetProperty( Toolkit::LayoutItem::ChildProperty::HEIGHT_SPECIFICATION, childLayout->GetMeasuredHeight().mValue ); // Remeasure with new dimensions MeasureChildWithMargins( childLayout, uniformMeasureSpec, 0, heightMeasureSpec, 0 ); - childOwner.SetProperty( Toolkit::LayoutBase::ChildProperty::HEIGHT_SPECIFICATION, oldHeight ); + childOwner.SetProperty( Toolkit::LayoutItem::ChildProperty::HEIGHT_SPECIFICATION, oldHeight ); } } } @@ -238,7 +238,7 @@ void VboxLayout::OnLayout( bool changed, LayoutLength left, LayoutLength top, La for( unsigned int childIndex = 0; childIndex < count; childIndex++) { - LayoutBasePtr childLayout = GetChildAt( childIndex ); + LayoutItemPtr childLayout = GetChildAt( childIndex ); if( childLayout != nullptr ) { auto childWidth = childLayout->GetMeasuredWidth(); diff --git a/dali-toolkit/internal/layouting/vbox-layout-impl.h b/dali-toolkit/internal/layouting/vbox-layout-impl.h index e64bb16..fb88095 100644 --- a/dali-toolkit/internal/layouting/vbox-layout-impl.h +++ b/dali-toolkit/internal/layouting/vbox-layout-impl.h @@ -63,27 +63,27 @@ protected: virtual ~VboxLayout(); /** - * @copydoc LayoutBase::DoInitialize + * @copydoc LayoutItem::DoInitialize */ virtual void DoInitialize() override; /** - * @copydoc LayoutBase::DoRegisterChildProperties() + * @copydoc LayoutItem::DoRegisterChildProperties() */ virtual void DoRegisterChildProperties( const std::string& containerType ) override; /** - * @copydoc LayoutBase::OnChildAdd + * @copydoc LayoutItem::OnChildAdd */ - virtual void OnChildAdd( LayoutBase& child ) override; + virtual void OnChildAdd( LayoutItem& child ) override; /** - * @copydoc LayoutBase::OnMeasure + * @copydoc LayoutItem::OnMeasure */ virtual void OnMeasure( MeasureSpec widthMeasureSpec, MeasureSpec heightMeasureSpec ) override; /** - * @copydoc LayoutBase::OnLayout + * @copydoc LayoutItem::OnLayout */ virtual void OnLayout( bool changed, LayoutLength l, LayoutLength t, LayoutLength r, LayoutLength b ) override;