X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fscrollable%2Fitem-view%2Fdepth-layout.cpp;h=58731c8651a348f4fe59e3aec6f65046fc15404d;hb=e4eaa88f3c16c436082b8811984c6dfcefa0a848;hp=3b53bac3982ac07bdc8bb12c60210727a41fb6cc;hpb=82ae5bfae69e5db5845c495270c62b35bf6c3213;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/scrollable/item-view/depth-layout.cpp b/dali-toolkit/internal/controls/scrollable/item-view/depth-layout.cpp index 3b53bac..58731c8 100755 --- a/dali-toolkit/internal/controls/scrollable/item-view/depth-layout.cpp +++ b/dali-toolkit/internal/controls/scrollable/item-view/depth-layout.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 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,7 @@ // INTERNAL INCLUDES #include -#include +#include using namespace Dali; using namespace Dali::Toolkit; @@ -447,10 +447,6 @@ Degree DepthLayout::GetScrollDirection() const void DepthLayout::ApplyConstraints( Actor& actor, const int itemId, const Vector3& layoutSize, const Actor& itemViewActor ) { - if(HasLayoutChanged()) - { - SetDepthLayoutProperties(GetLayoutProperties()); - } Dali::Toolkit::ItemView itemView = Dali::Toolkit::ItemView::DownCast( itemViewActor ); if( itemView ) { @@ -559,7 +555,6 @@ void DepthLayout::SetDepthLayoutProperties(const Property::Map& properties) } } } - ResetLayoutChangedFlag(); } Vector3 DepthLayout::GetItemPosition( int itemID, float currentLayoutPosition, const Vector3& layoutSize ) const