From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Thu, 2 Apr 2015 17:57:46 +0000 (-0700)
Subject: Merge "Size negotiation patch 1: Removed SetPreferred size" into tizen
X-Git-Tag: accepted/tizen/common/20150407.101646~1
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=6e824d3bfb11cab305d0d8375b202076d59222b0;hp=-c

Merge "Size negotiation patch 1: Removed SetPreferred size" into tizen
---

6e824d3bfb11cab305d0d8375b202076d59222b0
diff --combined dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
index fbc3626,939d54b..9ac90b9
--- a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
+++ b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
@@@ -362,6 -362,8 +362,6 @@@ ItemView::ItemView(ItemFactory& factory
  
  void ItemView::OnInitialize()
  {
 -  RegisterCommonProperties();
 -
    Actor self = Self();
  
    // Disable size negotiation for item views
@@@ -377,10 -379,10 +377,10 @@@
  
    EnableScrollComponent(Toolkit::Scrollable::OvershootIndicator);
  
 -  Constraint constraint = Constraint::New<Vector3>(mPropertyRelativePosition,
 +  Constraint constraint = Constraint::New<Vector3>(Toolkit::Scrollable::Property::SCROLL_RELATIVE_POSITION,
                                                     LocalSource(mPropertyPosition),
 -                                                   LocalSource(mPropertyPositionMin),
 -                                                   LocalSource(mPropertyPositionMax),
 +                                                   LocalSource(Toolkit::Scrollable::Property::SCROLL_POSITION_MIN),
 +                                                   LocalSource(Toolkit::Scrollable::Property::SCROLL_POSITION_MAX),
                                                     LocalSource(Actor::Property::SIZE),
                                                     RelativePositionConstraint);
    self.ApplyConstraint(constraint);
@@@ -471,8 -473,7 +471,7 @@@ void ItemView::ActivateLayout(unsigned 
      if(mActiveLayout->GetItemSize(itemId, targetSize, size))
      {
        // resize immediately
-       actor.SetResizePolicy( FIXED, ALL_DIMENSIONS );
-       actor.SetPreferredSize( size.GetVectorXY() );
+       actor.SetSize( size.GetVectorXY() );
      }
  
      mActiveLayout->ApplyConstraints(actor, itemId, durationSeconds, mScrollPositionObject, Self() );
@@@ -518,7 -519,7 +517,7 @@@
  
    Radian scrollDirection(mActiveLayout->GetScrollDirection());
    float orientation = static_cast<float>(mActiveLayout->GetOrientation());
 -  self.SetProperty(mPropertyScrollDirection, Vector3(sinf(scrollDirection), cosf(scrollDirection), orientation));
 +  self.SetProperty(Toolkit::Scrollable::Property::SCROLL_DIRECTION, Vector3(sinf(scrollDirection), cosf(scrollDirection), orientation));
  
    self.SetProperty(mPropertyScrollSpeed, mScrollSpeed);
  
@@@ -994,8 -995,7 +993,7 @@@ void ItemView::SetupActor( Item item, f
      Vector3 size;
      if( mActiveLayout->GetItemSize( item.first, mActiveLayoutTargetSize, size ) )
      {
-       item.second.SetResizePolicy( FIXED, ALL_DIMENSIONS );
-       item.second.SetPreferredSize( size.GetVectorXY() );
+       item.second.SetSize( size.GetVectorXY() );
      }
  
      mActiveLayout->ApplyConstraints( item.second, item.first, durationSeconds, mScrollPositionObject, Self() );
@@@ -1453,22 -1453,22 +1451,22 @@@ void ItemView::CalculateDomainSize(cons
  
      if(IsHorizontal(mActiveLayout->GetOrientation()))
      {
 -      self.SetProperty(mPropertyPositionMin, Vector3(0.0f, firstItemPosition.x, 0.0f));
 -      self.SetProperty(mPropertyPositionMax, Vector3(0.0f, lastItemPosition.x, 0.0f));
 +      self.SetProperty(Toolkit::Scrollable::Property::SCROLL_POSITION_MIN, Vector3(0.0f, firstItemPosition.x, 0.0f));
 +      self.SetProperty(Toolkit::Scrollable::Property::SCROLL_POSITION_MAX, Vector3(0.0f, lastItemPosition.x, 0.0f));
        domainSize = fabs(firstItemPosition.x - lastItemPosition.x);
      }
      else
      {
 -      self.SetProperty(mPropertyPositionMin, Vector3(0.0f, firstItemPosition.y, 0.0f));
 -      self.SetProperty(mPropertyPositionMax, Vector3(0.0f, lastItemPosition.y, 0.0f));
 +      self.SetProperty(Toolkit::Scrollable::Property::SCROLL_POSITION_MIN, Vector3(0.0f, firstItemPosition.y, 0.0f));
 +      self.SetProperty(Toolkit::Scrollable::Property::SCROLL_POSITION_MAX, Vector3(0.0f, lastItemPosition.y, 0.0f));
        domainSize = fabs(firstItemPosition.y - lastItemPosition.y);
      }
  
      mScrollConnector.SetScrollDomain(minLayoutPosition, 0.0f, domainSize);
  
      bool isLayoutScrollable = IsLayoutScrollable(layoutSize);
 -    self.SetProperty(mPropertyCanScrollVertical, isLayoutScrollable);
 -    self.SetProperty(mPropertyCanScrollHorizontal, false);
 +    self.SetProperty(Toolkit::Scrollable::Property::CAN_SCROLL_VERTICAL, isLayoutScrollable);
 +    self.SetProperty(Toolkit::Scrollable::Property::CAN_SCROLL_HORIZONTAL, false);
    }
  }
  
@@@ -1476,8 -1476,8 +1474,8 @@@ Vector3 ItemView::GetDomainSize() cons
  {
    Actor self = Self();
  
 -  float minScrollPosition = self.GetProperty<float>(mPropertyPositionMin);
 -  float maxScrollPosition = self.GetProperty<float>(mPropertyPositionMax);
 +  float minScrollPosition = self.GetProperty<float>(Toolkit::Scrollable::Property::SCROLL_POSITION_MIN);
 +  float maxScrollPosition = self.GetProperty<float>(Toolkit::Scrollable::Property::SCROLL_POSITION_MAX);
  
    return Vector3(0.0f, fabs(maxScrollPosition - minScrollPosition), 0.0f);
  }
@@@ -1564,7 -1564,7 +1562,7 @@@ void ItemView::SetOvershootEnabled( boo
      self.Add(mOvershootOverlay);
  
      Constraint constraint = Constraint::New<Vector3>( Actor::Property::SIZE,
 -                                                      ParentSource( mPropertyScrollDirection ),
 +                                                      ParentSource( Toolkit::Scrollable::Property::SCROLL_DIRECTION ),
                                                        Source( mScrollPositionObject, ScrollConnector::OVERSHOOT ),
                                                        ParentSource( Actor::Property::SIZE ),
                                                        OvershootOverlaySizeConstraint() );
@@@ -1572,20 -1572,20 +1570,20 @@@
      mOvershootOverlay.SetSize(OVERSHOOT_BOUNCE_ACTOR_DEFAULT_SIZE.width, OVERSHOOT_BOUNCE_ACTOR_DEFAULT_SIZE.height);
  
      constraint = Constraint::New<Quaternion>( Actor::Property::ORIENTATION,
 -                                              ParentSource( mPropertyScrollDirection ),
 +                                              ParentSource( Toolkit::Scrollable::Property::SCROLL_DIRECTION ),
                                                Source( mScrollPositionObject, ScrollConnector::OVERSHOOT ),
                                                OvershootOverlayRotationConstraint() );
      mOvershootOverlay.ApplyConstraint(constraint);
  
      constraint = Constraint::New<Vector3>( Actor::Property::POSITION,
                                             ParentSource( Actor::Property::SIZE ),
 -                                           ParentSource( mPropertyScrollDirection ),
 +                                           ParentSource( Toolkit::Scrollable::Property::SCROLL_DIRECTION ),
                                             Source( mScrollPositionObject, ScrollConnector::OVERSHOOT ),
                                             OvershootOverlayPositionConstraint() );
      mOvershootOverlay.ApplyConstraint(constraint);
  
      constraint = Constraint::New<bool>( Actor::Property::VISIBLE,
 -                                        ParentSource( mPropertyCanScrollVertical ),
 +                                        ParentSource( Toolkit::Scrollable::Property::CAN_SCROLL_VERTICAL ),
                                          OvershootOverlayVisibilityConstraint() );
      mOvershootOverlay.ApplyConstraint(constraint);