X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fscrollable%2Fscroll-view%2Fscroll-base-impl.cpp;h=def121d05618ce9e9ba5f2d56bbe075f71d3f8d6;hb=HEAD;hp=e346ccb11cc482464599f0fee61c44dd459d609e;hpb=f4d559ea999cbbc44b1ecd489c4ca3711d37feca;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.cpp
index e346ccb..def121d 100644
--- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.cpp
+++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.cpp
@@ -15,73 +15,33 @@
  *
  */
 
+// CLASS HEADER
 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h>
 
 using namespace Dali;
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 namespace Internal
 {
-
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // ScrollBase
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-const std::string ScrollBase::SCROLL_DOMAIN_OFFSET_PROPERTY_NAME( "domain-offset" );
-
-ScrollBase::ScrollBase()
-: Scrollable(),
+ScrollBase::ScrollBase(ControlBehaviour behaviourFlags)
+: Scrollable(behaviourFlags),
   mParent(NULL),
-  mPropertyTime(Property::INVALID_INDEX),
-  mPropertyPrePosition(Property::INVALID_INDEX),
-  mPropertyPosition(Property::INVALID_INDEX),
-  mPropertyScale(Property::INVALID_INDEX),
-  mPropertyOvershootX(Property::INVALID_INDEX),
-  mPropertyOvershootY(Property::INVALID_INDEX),
-  mPropertyWrap(Property::INVALID_INDEX),
-  mPropertyPanning(Property::INVALID_INDEX),
-  mPropertyScrolling(Property::INVALID_INDEX),
-  mPropertyFinal(Property::INVALID_INDEX),
-  mPropertyDomainOffset(Property::INVALID_INDEX),
-  mPropertyPositionDelta(Property::INVALID_INDEX),
-  mPropertyScrollStartPagePosition(Property::INVALID_INDEX),
   mDelay(0.0f)
 {
 }
 
-void ScrollBase::SetParent(ScrollBase *parent)
+void ScrollBase::SetParent(ScrollBase* parent)
 {
   mParent = parent;
 }
 
-void ScrollBase::RegisterProperties()
-{
-  Actor self = Self();
-
-  // Register common properties
-  RegisterCommonProperties();
-
-  // Register Scroll Properties.
-  mPropertyTime = self.RegisterProperty(Toolkit::ScrollView::SCROLL_TIME_PROPERTY_NAME, 0.0f);
-  mPropertyPrePosition = self.RegisterProperty(Toolkit::ScrollView::SCROLL_PRE_POSITION_PROPERTY_NAME, Vector3::ZERO);
-  mPropertyPosition = self.RegisterProperty(Toolkit::ScrollView::SCROLL_POSITION_PROPERTY_NAME, Vector3::ZERO);
-  mPropertyOvershootX = self.RegisterProperty(Toolkit::ScrollView::SCROLL_OVERSHOOT_X_PROPERTY_NAME, 0.0f);
-  mPropertyOvershootY = self.RegisterProperty(Toolkit::ScrollView::SCROLL_OVERSHOOT_Y_PROPERTY_NAME, 0.0f);
-  mPropertyFinal = self.RegisterProperty(Toolkit::ScrollView::SCROLL_FINAL_PROPERTY_NAME, Vector3::ZERO);
-  mPropertyScale = self.RegisterProperty(Toolkit::ScrollView::SCROLL_SCALE_PROPERTY_NAME, Vector3::ONE);
-  mPropertyWrap = self.RegisterProperty(Toolkit::ScrollView::SCROLL_WRAP_PROPERTY_NAME, false);
-  mPropertyPanning = self.RegisterProperty(Toolkit::ScrollView::SCROLL_PANNING_PROPERTY_NAME, false);
-  mPropertyScrolling = self.RegisterProperty(Toolkit::ScrollView::SCROLL_SCROLLING_PROPERTY_NAME, false);
-  mPropertyDomainOffset = self.RegisterProperty(SCROLL_DOMAIN_OFFSET_PROPERTY_NAME, Vector3::ZERO);
-  mPropertyPositionDelta = self.RegisterProperty(Toolkit::ScrollView::SCROLL_POSITION_DELTA_PROPERTY_NAME, Vector3::ZERO);
-  mPropertyScrollStartPagePosition = self.RegisterProperty(Toolkit::ScrollView::SCROLL_START_PAGE_POSITION_PROPERTY_NAME, Vector3::ZERO);
-}
-
 void ScrollBase::BindActor(Actor child)
 {
   FindAndUnbindActor(child);
@@ -92,7 +52,7 @@ void ScrollBase::BindActor(Actor child)
   // Apply all our constraints to this new child.
   ConstraintStack::iterator i;
 
-  for(i = mConstraintStack.begin();i!=mConstraintStack.end();i++)
+  for(i = mConstraintStack.begin(); i != mConstraintStack.end(); i++)
   {
     actorInfo->ApplyConstraint(*i);
   }
@@ -101,11 +61,11 @@ void ScrollBase::BindActor(Actor child)
 void ScrollBase::UnbindActor(Actor child)
 {
   // Find the child in mBoundActors, and unparent it
-  for (ActorInfoIter iter = mBoundActors.begin(); iter != mBoundActors.end(); ++iter)
+  for(ActorInfoIter iter = mBoundActors.begin(); iter != mBoundActors.end(); ++iter)
   {
     ActorInfoPtr actorInfo = *iter;
 
-    if( actorInfo->mActor == child )
+    if(actorInfo->mActor == child)
     {
       mBoundActors.erase(iter);
       break;
@@ -132,7 +92,7 @@ void ScrollBase::ApplyConstraintToBoundActors(Constraint constraint)
 {
   mConstraintStack.push_back(constraint);
 
-  for(ActorInfoIter i = mBoundActors.begin();i != mBoundActors.end(); ++i)
+  for(ActorInfoIter i = mBoundActors.begin(); i != mBoundActors.end(); ++i)
   {
     (*i)->ApplyConstraint(constraint);
   }
@@ -142,7 +102,7 @@ void ScrollBase::RemoveConstraintsFromBoundActors()
 {
   mConstraintStack.clear();
 
-  for(ActorInfoIter i = mBoundActors.begin();i != mBoundActors.end(); ++i)
+  for(ActorInfoIter i = mBoundActors.begin(); i != mBoundActors.end(); ++i)
   {
     (*i)->RemoveConstraints();
   }