X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fscrollable%2Fitem-view%2Fitem-view-impl.cpp;h=9e4f57ea5c09a0b2f384136ea0765b512a058a71;hb=eaebf2e8aa5903e4acbb37ae46050e009863146c;hp=b7c1e579bba0f61169bfa7757760480bd8c337e2;hpb=0b98fd2bb35714d1b888ca2de530f8d6be8050f8;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp old mode 100644 new mode 100755 index b7c1e57..9e4f57e --- a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp +++ b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 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. @@ -21,22 +21,29 @@ // EXTERNAL INCLUDES #include // for strcmp #include +#include + #include #include -#include #include #include #include #include #include +#include // INTERNAL INCLUDES #include #include +#include +#include +#include +#include +#include +#include #include using std::string; -using std::set; using namespace Dali; namespace // Unnamed namespace @@ -60,6 +67,8 @@ const float OVERSHOOT_BOUNCE_ACTOR_RESIZE_THRESHOLD = 180.0f; const Vector4 OVERSHOOT_OVERLAY_NINE_PATCH_BORDER(0.0f, 0.0f, 1.0f, 12.0f); const float DEFAULT_KEYBOARD_FOCUS_SCROLL_DURATION = 0.2f; +const unsigned int OVERSHOOT_SIZE_CONSTRAINT_TAG(42); + /** * Local helper to convert pan distance (in actor coordinates) to the layout-specific scrolling direction */ @@ -250,6 +259,8 @@ DALI_PROPERTY_REGISTRATION( Toolkit, ItemView, "minimumSwipeDistance", FLO DALI_PROPERTY_REGISTRATION( Toolkit, ItemView, "wheelScrollDistanceStep", FLOAT, WHEEL_SCROLL_DISTANCE_STEP ) DALI_PROPERTY_REGISTRATION( Toolkit, ItemView, "snapToItemEnabled", BOOLEAN, SNAP_TO_ITEM_ENABLED ) DALI_PROPERTY_REGISTRATION( Toolkit, ItemView, "refreshInterval", FLOAT, REFRESH_INTERVAL ) +DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, ItemView, "layout", ARRAY, LAYOUT ) + DALI_ANIMATABLE_PROPERTY_REGISTRATION( Toolkit, ItemView, "layoutPosition", FLOAT, LAYOUT_POSITION) DALI_ANIMATABLE_PROPERTY_REGISTRATION( Toolkit, ItemView, "scrollSpeed", FLOAT, SCROLL_SPEED) @@ -262,19 +273,47 @@ DALI_SIGNAL_REGISTRATION( Toolkit, ItemView, "layoutActivated", DALI_ACTION_REGISTRATION( Toolkit, ItemView, "stopScrolling", ACTION_STOP_SCROLLING ) +DALI_ACTION_REGISTRATION( Toolkit, ItemView, "enableRefresh", ACTION_ENABLE_REFRESH ) +DALI_ACTION_REGISTRATION( Toolkit, ItemView, "disableRefresh", ACTION_DISABLE_REFRESH ) + DALI_TYPE_REGISTRATION_END() -bool FindById( const ItemContainer& items, ItemId id ) +const ItemIter FindItemById( ItemContainer& items, ItemId id ) { - for( ConstItemIter iter = items.begin(); items.end() != iter; ++iter ) + for( ItemIter iter = items.begin(); items.end() != iter; ++iter ) { if( iter->first == id ) { - return true; + return iter; } } - return false; + return items.end(); +} + +void InsertToItemContainer( ItemContainer& items, Item item ) +{ + if( items.end() == FindItemById( items, item.first ) ) + { + ItemIter iterToInsert = std::lower_bound( items.begin(), items.end(), item ); + items.insert( iterToInsert, item ); + } +} + + +/** + * Helper to apply size constraint to mOvershootOverlay + * @param[in] overshootOverlay The overshootOverlay actor + * @param[in] The required height + */ +void ApplyOvershootSizeConstraint( Actor overshootOverlay, float height ) +{ + Constraint constraint = Constraint::New( overshootOverlay, Actor::Property::SIZE, OvershootOverlaySizeConstraint( height ) ); + constraint.AddSource( ParentSource( Dali::Toolkit::ItemView::Property::SCROLL_DIRECTION ) ); + constraint.AddSource( ParentSource( Dali::Toolkit::ItemView::Property::LAYOUT_ORIENTATION ) ); + constraint.AddSource( ParentSource( Dali::Actor::Property::SIZE ) ); + constraint.SetTag( OVERSHOOT_SIZE_CONSTRAINT_TAG ); + constraint.Apply(); } } // unnamed namespace @@ -295,7 +334,7 @@ Dali::Toolkit::ItemView ItemView::New(ItemFactory& factory) } ItemView::ItemView(ItemFactory& factory) -: Scrollable( ControlBehaviour( DISABLE_SIZE_NEGOTIATION | REQUIRES_WHEEL_EVENTS | REQUIRES_KEYBOARD_NAVIGATION_SUPPORT ) ), +: Scrollable( ControlBehaviour( DISABLE_SIZE_NEGOTIATION | DISABLE_STYLE_CHANGE_SIGNALS | REQUIRES_WHEEL_EVENTS | REQUIRES_KEYBOARD_NAVIGATION_SUPPORT ) ), mItemFactory(factory), mItemsParentOrigin(ParentOrigin::CENTER), mItemsAnchorPoint(AnchorPoint::CENTER), @@ -317,6 +356,7 @@ ItemView::ItemView(ItemFactory& factory) mIsFlicking(false), mAddingItems(false), mRefreshEnabled(true), + mRefreshNotificationEnabled(true), mInAnimation(false) { } @@ -375,7 +415,7 @@ ItemLayoutPtr ItemView::GetActiveLayout() const float ItemView::GetCurrentLayoutPosition(unsigned int itemId) const { - return Self().GetProperty( Toolkit::ItemView::Property::LAYOUT_POSITION ) + static_cast( itemId ); + return Self().GetCurrentProperty< float >( Toolkit::ItemView::Property::LAYOUT_POSITION ) + static_cast( itemId ); } void ItemView::ActivateLayout(unsigned int layoutIndex, const Vector3& targetSize, float durationSeconds) @@ -395,7 +435,7 @@ void ItemView::ActivateLayout(unsigned int layoutIndex, const Vector3& targetSiz // Move the items to the new layout positions... - for (ConstItemPoolIter iter = mItemPool.begin(); iter != mItemPool.end(); ++iter) + for (ConstItemIter iter = mItemPool.begin(); iter != mItemPool.end(); ++iter) { unsigned int itemId = iter->first; Actor actor = iter->second; @@ -403,11 +443,11 @@ void ItemView::ActivateLayout(unsigned int layoutIndex, const Vector3& targetSiz // Remove constraints from previous layout actor.RemoveConstraints(); + mActiveLayout->ApplyConstraints(actor, itemId, targetSize, Self() ); + Vector3 size; mActiveLayout->GetItemSize( itemId, targetSize, size ); actor.SetSize( size.GetVectorXY() ); - - mActiveLayout->ApplyConstraints(actor, itemId, targetSize, Self() ); } // Refresh the new layout @@ -462,7 +502,7 @@ void ItemView::DeactivateCurrentLayout() { if (mActiveLayout) { - for (ConstItemPoolIter iter = mItemPool.begin(); iter != mItemPool.end(); ++iter) + for (ConstItemIter iter = mItemPool.begin(); iter != mItemPool.end(); ++iter) { Actor actor = iter->second; actor.RemoveConstraints(); @@ -474,19 +514,22 @@ void ItemView::DeactivateCurrentLayout() void ItemView::OnRefreshNotification(PropertyNotification& source) { - // Cancel scroll animation to prevent any fighting of setting the scroll position property by scroll bar during fast scroll. - if(!mRefreshEnabled && mScrollAnimation) + if( mRefreshNotificationEnabled ) { - RemoveAnimation(mScrollAnimation); - } + // Cancel scroll animation to prevent any fighting of setting the scroll position property by scroll bar during fast scroll. + if(!mRefreshEnabled && mScrollAnimation) + { + RemoveAnimation(mScrollAnimation); + } - // Only cache extra items when it is not a fast scroll - DoRefresh(GetCurrentLayoutPosition(0), mRefreshEnabled || mScrollAnimation); + // Only cache extra items when it is not a fast scroll + DoRefresh(GetCurrentLayoutPosition(0), mRefreshEnabled || mScrollAnimation); + } } void ItemView::Refresh() { - for (ItemPoolIter iter = mItemPool.begin(); iter != mItemPool.end(); ++iter ) + for (ConstItemIter iter = mItemPool.begin(); iter != mItemPool.end(); ++iter ) { ReleaseActor( iter->first, iter->second ); } @@ -587,10 +630,13 @@ Actor ItemView::GetItem(unsigned int itemId) const { Actor actor; - ConstItemPoolIter iter = mItemPool.find( itemId ); - if( iter != mItemPool.end() ) + for ( ConstItemIter iter = mItemPool.begin(); iter != mItemPool.end(); ++iter ) { - actor = iter->second; + if( iter->first == itemId ) + { + actor = iter->second; + break; + } } return actor; @@ -600,7 +646,7 @@ unsigned int ItemView::GetItemId( Actor actor ) const { unsigned int itemId( 0 ); - for ( ConstItemPoolIter iter = mItemPool.begin(); iter != mItemPool.end(); ++iter ) + for ( ConstItemIter iter = mItemPool.begin(); iter != mItemPool.end(); ++iter ) { if( iter->second == actor ) { @@ -618,9 +664,9 @@ void ItemView::InsertItem( Item newItem, float durationSeconds ) Vector3 layoutSize = Self().GetCurrentSize(); Actor displacedActor; - ItemPoolIter afterDisplacedIter = mItemPool.end(); + ItemIter afterDisplacedIter = mItemPool.end(); - ItemPoolIter foundIter = mItemPool.find( newItem.first ); + ItemIter foundIter = FindItemById( mItemPool, newItem.first ); if( mItemPool.end() != foundIter ) { SetupActor( newItem, layoutSize ); @@ -634,12 +680,12 @@ void ItemView::InsertItem( Item newItem, float durationSeconds ) else { // Inserting before the existing item range? - ItemPoolIter iter = mItemPool.begin(); + ItemIter iter = mItemPool.begin(); if( iter != mItemPool.end() && iter->first > newItem.first ) { displacedActor = iter->second; - mItemPool.erase( iter++ ); // iter is still valid after the erase + iter = mItemPool.erase( iter ); // iter is still valid after the erase afterDisplacedIter = iter; } @@ -648,7 +694,7 @@ void ItemView::InsertItem( Item newItem, float durationSeconds ) if( displacedActor ) { // Move the existing actors to make room - for( ItemPoolIter iter = afterDisplacedIter; mItemPool.end() != iter; ++iter ) + for( ItemIter iter = afterDisplacedIter; mItemPool.end() != iter; ++iter ) { Actor temp = iter->second; iter->second = displacedActor; @@ -659,12 +705,12 @@ void ItemView::InsertItem( Item newItem, float durationSeconds ) } // Create last item - ItemPool::reverse_iterator lastIter = mItemPool.rbegin(); + ItemContainer::reverse_iterator lastIter = mItemPool.rbegin(); if ( lastIter != mItemPool.rend() ) { ItemId lastId = lastIter->first; Item lastItem( lastId + 1, displacedActor ); - mItemPool.insert( lastItem ); + InsertToItemContainer( mItemPool, lastItem ); lastItem.second.RemoveConstraints(); mActiveLayout->ApplyConstraints( lastItem.second, lastItem.first, layoutSize, Self() ); @@ -682,24 +728,21 @@ void ItemView::InsertItems( const ItemContainer& newItems, float durationSeconds Vector3 layoutSize = Self().GetCurrentSize(); // Insert from lowest id to highest - std::set sortedItems; - for( ConstItemIter iter = newItems.begin(); newItems.end() != iter; ++iter ) - { - sortedItems.insert( *iter ); - } + ItemContainer sortedItems(newItems); + std::sort( sortedItems.begin(), sortedItems.end() ); - for( std::set::iterator iter = sortedItems.begin(); sortedItems.end() != iter; ++iter ) + for( ItemIter iter = sortedItems.begin(); sortedItems.end() != iter; ++iter ) { Self().Add( iter->second ); - ItemPoolIter foundIter = mItemPool.find( iter->first ); + ItemIter foundIter = FindItemById( mItemPool, iter->first ); if( mItemPool.end() != foundIter ) { Actor moveMe = foundIter->second; foundIter->second = iter->second; // Move the existing actors to make room - for( ItemPoolIter iter = ++foundIter; mItemPool.end() != iter; ++iter ) + for( ItemIter iter = ++foundIter; mItemPool.end() != iter; ++iter ) { Actor temp = iter->second; iter->second = moveMe; @@ -709,19 +752,19 @@ void ItemView::InsertItems( const ItemContainer& newItems, float durationSeconds // Create last item ItemId lastId = mItemPool.rbegin()->first; Item lastItem( lastId + 1, moveMe ); - mItemPool.insert( lastItem ); + InsertToItemContainer( mItemPool, lastItem ); } else { - mItemPool.insert( *iter ); + InsertToItemContainer( mItemPool, *iter ); } } // Relayout everything - for (ItemPoolIter iter = mItemPool.begin(); iter != mItemPool.end(); ++iter) + for (ItemIter iter = mItemPool.begin(); iter != mItemPool.end(); ++iter) { // If newly inserted - if( FindById( newItems, iter->first ) ) + if( std::binary_search( sortedItems.begin(), sortedItems.end(), *iter ) ) { SetupActor( *iter, layoutSize ); } @@ -753,13 +796,10 @@ void ItemView::RemoveItems( const ItemIdContainer& itemIds, float durationSecond bool actorsReordered( false ); // Remove from highest id to lowest - set sortedItems; - for( ConstItemIdIter iter = itemIds.begin(); itemIds.end() != iter; ++iter ) - { - sortedItems.insert( *iter ); - } + ItemIdContainer sortedItems(itemIds); + std::sort( sortedItems.begin(), sortedItems.end() ); - for( set::reverse_iterator iter = sortedItems.rbegin(); sortedItems.rend() != iter; ++iter ) + for( ItemIdContainer::reverse_iterator iter = sortedItems.rbegin(); sortedItems.rend() != iter; ++iter ) { if( RemoveActor( *iter ) ) { @@ -779,7 +819,7 @@ bool ItemView::RemoveActor(unsigned int itemId) { bool reordered( false ); - ItemPoolIter removeIter = mItemPool.find( itemId ); + ItemIter removeIter = FindItemById( mItemPool, itemId ); if( removeIter != mItemPool.end() ) { ReleaseActor(itemId, removeIter->second); @@ -787,12 +827,12 @@ bool ItemView::RemoveActor(unsigned int itemId) else { // Removing before the existing item range? - ItemPoolIter iter = mItemPool.begin(); + ItemIter iter = mItemPool.begin(); if( iter != mItemPool.end() && iter->first > itemId ) { // In order to decrement the first visible item ID - mItemPool.insert( Item(iter->first - 1, Actor()) ); + InsertToItemContainer( mItemPool, Item(iter->first - 1, Actor()) ); removeIter = mItemPool.begin(); } @@ -808,11 +848,11 @@ bool ItemView::RemoveActor(unsigned int itemId) // ID 2 - ActorB ID 2 - ActorC (previously ID 3) // ID 3 - ActorC ID 3 - ActorB (previously ID 4) // ID 4 - ActorD - for (ItemPoolIter iter = removeIter; iter != mItemPool.end(); ++iter) + for (ItemIter iter = removeIter; iter != mItemPool.end(); ++iter) { if( iter->first < mItemPool.rbegin()->first ) { - iter->second = mItemPool[ iter->first + 1 ]; + iter->second = ( iter + 1 )->second; } else { @@ -833,7 +873,7 @@ void ItemView::ReplaceItem( Item replacementItem, float durationSeconds ) SetupActor( replacementItem, layoutSize ); Self().Add( replacementItem.second ); - const ItemPoolIter iter = mItemPool.find( replacementItem.first ); + const ItemIter iter = FindItemById( mItemPool, replacementItem.first ); if( mItemPool.end() != iter ) { ReleaseActor(iter->first, iter->second); @@ -841,7 +881,7 @@ void ItemView::ReplaceItem( Item replacementItem, float durationSeconds ) } else { - mItemPool.insert( replacementItem ); + InsertToItemContainer( mItemPool, replacementItem ); } CalculateDomainSize( layoutSize ); @@ -860,7 +900,7 @@ void ItemView::ReplaceItems( const ItemContainer& replacementItems, float durati void ItemView::RemoveActorsOutsideRange( ItemRange range ) { // Remove unwanted actors from the ItemView & ItemPool - for (ItemPoolIter iter = mItemPool.begin(); iter != mItemPool.end(); ) + for (ItemIter iter = mItemPool.begin(); iter != mItemPool.end(); ) { unsigned int current = iter->first; @@ -868,7 +908,7 @@ void ItemView::RemoveActorsOutsideRange( ItemRange range ) { ReleaseActor(iter->first, iter->second); - mItemPool.erase( iter++ ); // erase invalidates the return value of post-increment; iter remains valid + iter = mItemPool.erase( iter ); // iter is still valid after the erase } else { @@ -906,7 +946,7 @@ void ItemView::AddNewActor( unsigned int itemId, const Vector3& layoutSize ) { mAddingItems = true; - if( mItemPool.end() == mItemPool.find( itemId ) ) + if( mItemPool.end() == FindItemById( mItemPool, itemId ) ) { Actor actor = mItemFactory.NewItem( itemId ); @@ -914,7 +954,7 @@ void ItemView::AddNewActor( unsigned int itemId, const Vector3& layoutSize ) { Item newItem( itemId, actor ); - mItemPool.insert( newItem ); + InsertToItemContainer( mItemPool, newItem ); SetupActor( newItem, layoutSize ); Self().Add( actor ); @@ -979,6 +1019,8 @@ void ItemView::OnChildAdd(Actor& child) Toolkit::ItemView::Property::SCROLL_CONTENT_SIZE); } } + + Scrollable::OnChildAdd( child ); } bool ItemView::OnWheelEvent(const WheelEvent& event) @@ -1036,7 +1078,7 @@ void ItemView::ReapplyAllConstraints() { Vector3 layoutSize = Self().GetCurrentSize(); - for (ConstItemPoolIter iter = mItemPool.begin(); iter != mItemPool.end(); ++iter) + for (ConstItemIter iter = mItemPool.begin(); iter != mItemPool.end(); ++iter) { unsigned int id = iter->first; Actor actor = iter->second; @@ -1152,10 +1194,12 @@ void ItemView::OnPan( const PanGesture& gesture ) mScrollAnimation.AnimateTo( Property(self, Toolkit::ItemView::Property::SCROLL_SPEED), 0.0f, AlphaFunction::EASE_OUT ); mIsFlicking = true; + // Check whether it has already scrolled to the end - if(fabs(currentLayoutPosition - firstItemScrollPosition) > Math::MACHINE_EPSILON_0) + if( fabs(currentLayoutPosition - firstItemScrollPosition) < Math::MACHINE_EPSILON_0 ) { - AnimateScrollOvershoot(0.0f); + AnimateScrollOvershoot( 0.0f ); + RemoveAnimation( mScrollAnimation ); } } @@ -1194,7 +1238,7 @@ void ItemView::OnPan( const PanGesture& gesture ) float firstItemScrollPosition = ClampFirstItemPosition(layoutPositionDelta, layoutSize, *mActiveLayout); - float currentOvershoot = self.GetProperty(Toolkit::ItemView::Property::OVERSHOOT); + float currentOvershoot = self.GetCurrentProperty< float >( Toolkit::ItemView::Property::OVERSHOOT ); self.SetProperty(Toolkit::ItemView::Property::LAYOUT_POSITION, firstItemScrollPosition ); @@ -1499,6 +1543,18 @@ void ItemView::ScrollTo(const Vector2& position, float duration) mRefreshEnabled = true; } +void ItemView::SetOvershootSize( const Vector2& size ) +{ + mOvershootSize = size; + + if( mOvershootOverlay ) + { + // Remove old & add new size constraint + mOvershootOverlay.RemoveConstraints( OVERSHOOT_SIZE_CONSTRAINT_TAG ); + ApplyOvershootSizeConstraint( mOvershootOverlay, mOvershootSize.height ); + } +} + void ItemView::SetOvershootEffectColor( const Vector4& color ) { mOvershootEffectColor = color; @@ -1523,15 +1579,9 @@ void ItemView::EnableScrollOvershoot( bool enable ) mOvershootOverlay.SetDrawMode( DrawMode::OVERLAY_2D ); self.Add(mOvershootOverlay); - Constraint constraint = Constraint::New( mOvershootOverlay, Actor::Property::SIZE, OvershootOverlaySizeConstraint(mOvershootSize.height) ); - constraint.AddSource( ParentSource( Toolkit::ItemView::Property::SCROLL_DIRECTION ) ); - constraint.AddSource( ParentSource( Toolkit::ItemView::Property::LAYOUT_ORIENTATION ) ); - constraint.AddSource( ParentSource( Actor::Property::SIZE ) ); - constraint.Apply(); - - mOvershootOverlay.SetSize(mOvershootSize.width, mOvershootSize.height); + ApplyOvershootSizeConstraint( mOvershootOverlay, mOvershootSize.height ); - constraint = Constraint::New( mOvershootOverlay, Actor::Property::ORIENTATION, OvershootOverlayRotationConstraint ); + Constraint constraint = Constraint::New( mOvershootOverlay, Actor::Property::ORIENTATION, OvershootOverlayRotationConstraint ); constraint.AddSource( ParentSource( Toolkit::ItemView::Property::SCROLL_DIRECTION ) ); constraint.AddSource( ParentSource( Toolkit::ItemView::Property::LAYOUT_ORIENTATION ) ); constraint.AddSource( ParentSource( Toolkit::ItemView::Property::OVERSHOOT ) ); @@ -1600,7 +1650,7 @@ void ItemView::AnimateScrollOvershoot(float overshootAmount, bool animateBack) if(mOvershootAnimationSpeed > Math::MACHINE_EPSILON_0) { - float currentOvershoot = self.GetProperty(Toolkit::ItemView::Property::OVERSHOOT); + float currentOvershoot = self.GetCurrentProperty< float >( Toolkit::ItemView::Property::OVERSHOOT ); float duration = 0.0f; if (mOvershootOverlay) @@ -1628,7 +1678,7 @@ void ItemView::SetItemsParentOrigin( const Vector3& parentOrigin ) if( parentOrigin != mItemsParentOrigin ) { mItemsParentOrigin = parentOrigin; - for (ItemPoolIter iter = mItemPool.begin(); iter != mItemPool.end(); ++iter) + for (ItemIter iter = mItemPool.begin(); iter != mItemPool.end(); ++iter) { iter->second.SetParentOrigin(parentOrigin); } @@ -1645,7 +1695,7 @@ void ItemView::SetItemsAnchorPoint( const Vector3& anchorPoint ) if( anchorPoint != mItemsAnchorPoint ) { mItemsAnchorPoint = anchorPoint; - for (ItemPoolIter iter = mItemPool.begin(); iter != mItemPool.end(); ++iter) + for (ItemIter iter = mItemPool.begin(); iter != mItemPool.end(); ++iter) { iter->second.SetAnchorPoint(anchorPoint); } @@ -1725,6 +1775,94 @@ void ItemView::SetProperty( BaseObject* object, Property::Index index, const Pro itemViewImpl.SetRefreshInterval( value.Get() ); break; } + case Toolkit::DevelItemView::Property::LAYOUT: + { + // Get a Property::Array from the property if possible. + Property::Array layoutArray; + if( value.Get( layoutArray ) ) + { + itemViewImpl.SetLayoutArray( layoutArray ); + } + break; + } + } + } +} + +Property::Array ItemView::GetLayoutArray() +{ + return mlayoutArray; +} + +void ItemView::SetLayoutArray( const Property::Array& layouts ) +{ + mlayoutArray = layouts; + const int layoutCount = GetLayoutCount(); + if( layoutCount > 0 ) + { + for(int index = layoutCount - 1; index >= 0; --index) + { + RemoveLayout(index); + if(index == 0) break; + } + } + + for( unsigned int arrayIdx = 0, arrayCount = layouts.Count(); arrayIdx < arrayCount; ++arrayIdx ) + { + const Property::Value& element = layouts.GetElementAt( arrayIdx ); + + Property::Map* layout = element.GetMap(); + if( layout != NULL ) + { + for( unsigned int mapIdx = 0, mapCount = (*layout).Count(); mapIdx < mapCount; ++mapIdx ) + { + KeyValuePair propertyPair( (*layout).GetKeyValue( mapIdx ) ); + + if(propertyPair.first == DefaultItemLayoutProperty::TYPE) + { + int layoutType = propertyPair.second.Get(); + if(layoutType <= DefaultItemLayout::SPIRAL && layoutType >= DefaultItemLayout::DEPTH) + { + //DEPTH, GRID, LIST, SPIRAL + switch(DefaultItemLayout::Type(layoutType)) + { + case DefaultItemLayout::DEPTH: + { + Internal::DepthLayoutPtr depthLayout = Internal::DepthLayout::New(); + (*depthLayout).SetLayoutProperties(*layout); + (*depthLayout).SetDepthLayoutProperties(*layout); + AddLayout(*depthLayout); + break; + } + case DefaultItemLayout::GRID: + { + Internal::GridLayoutPtr gridLayout = Internal::GridLayout::New(); + (*gridLayout).SetLayoutProperties(*layout); + (*gridLayout).SetGridLayoutProperties(*layout); + AddLayout(*gridLayout); + break; + } + case DefaultItemLayout::LIST: + { + Internal::GridLayoutPtr listLayout = Internal::GridLayout::New(); + listLayout->SetNumberOfColumns( 1 ); + (*listLayout).SetLayoutProperties(*layout); + (*listLayout).SetGridLayoutProperties(*layout); + AddLayout(*listLayout); + break; + } + case DefaultItemLayout::SPIRAL: + { + Internal::SpiralLayoutPtr spiralLayout = Internal::SpiralLayout::New(); + (*spiralLayout).SetLayoutProperties(*layout); + (*spiralLayout).SetSpiralLayoutProperties(*layout); + AddLayout(*spiralLayout); + break; + } + } + } + } + } } } } @@ -1765,6 +1903,13 @@ Property::Value ItemView::GetProperty( BaseObject* object, Property::Index index value = itemViewImpl.GetRefreshInterval(); break; } + case Toolkit::DevelItemView::Property::LAYOUT: + { + Property::Array layouts= itemViewImpl.GetLayoutArray(); + value = layouts; + break; + } + } } @@ -1783,6 +1928,14 @@ bool ItemView::DoAction( BaseObject* object, const std::string& actionName, cons { GetImpl( itemView ).DoStopScrolling(); } + else if ( 0 == strcmp( actionName.c_str(), ACTION_ENABLE_REFRESH ) ) + { + GetImpl( itemView ).SetRefreshNotificationEnabled( true ); + } + else if ( 0 == strcmp( actionName.c_str(), ACTION_DISABLE_REFRESH ) ) + { + GetImpl( itemView ).SetRefreshNotificationEnabled( false ); + } return true; } @@ -1796,6 +1949,11 @@ void ItemView::DoStopScrolling() } } +void ItemView::SetRefreshNotificationEnabled( bool enabled ) +{ + mRefreshNotificationEnabled = enabled; +} + } // namespace Internal } // namespace Toolkit