X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fscroll-bar%2Fscroll-bar-impl.cpp;h=c5884879e995c08c5f983175b6997e175ed60e3f;hp=7056b0c1a6b29c11272d3ef75bcdd9b6ba1685e6;hb=b1e8521ad77e7b4e62b59613b2edef64429130e9;hpb=73bd6099851981f1e166a809105e2096c5620303

diff --git a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
old mode 100755
new mode 100644
index 7056b0c..c588487
--- a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
+++ b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
@@ -177,8 +177,8 @@ DALI_ACTION_REGISTRATION(   Toolkit, ScrollBar, "ShowTransientIndicator",
 
 DALI_TYPE_REGISTRATION_END()
 
-const char* SCROLL_DIRECTION_NAME[] = {"Vertical", "Horizontal"};
-const char* INDICATOR_HEIGHT_POLICY_NAME[] = {"Variable", "Fixed"};
+const char* SCROLL_DIRECTION_NAME[] = {"VERTICAL", "HORIZONTAL"};
+const char* INDICATOR_HEIGHT_POLICY_NAME[] = {"VARIABLE", "FIXED"};
 
 }
 
@@ -195,9 +195,9 @@ ScrollBar::ScrollBar(Toolkit::ScrollBar::Direction direction)
   mIndicatorHideDuration(DEFAULT_INDICATOR_HIDE_DURATION),
   mTransientIndicatorDuration(DEFAULT_INDICATOR_TRANSIENT_DURATION),
   mScrollStart(0.0f),
-  mGestureDisplacement( Vector3::ZERO ),
+  mGestureDisplacement( Vector2::ZERO ),
   mCurrentScrollPosition(0.0f),
-  mIndicatorHeightPolicy(Toolkit::ScrollBar::Variable),
+  mIndicatorHeightPolicy(Toolkit::ScrollBar::VARIABLE),
   mIndicatorFixedHeight(DEFAULT_INDICATOR_FIXED_HEIGHT),
   mIndicatorMinimumHeight(DEFAULT_INDICATOR_MINIMUM_HEIGHT),
   mIndicatorStartPadding(DEFAULT_INDICATOR_START_PADDING),
@@ -304,7 +304,7 @@ void ScrollBar::ApplyConstraints()
     }
 
     // Set indicator height according to the indicator's height policy
-    if(mIndicatorHeightPolicy == Toolkit::ScrollBar::Fixed)
+    if(mIndicatorHeightPolicy == Toolkit::ScrollBar::FIXED)
     {
       mIndicator.SetProperty( Actor::Property::SIZE, Vector2( Self().GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).width, mIndicatorFixedHeight) );
     }
@@ -459,9 +459,9 @@ void ScrollBar::OnPan( const PanGesture& gesture )
   {
     Dali::Toolkit::ItemView itemView = Dali::Toolkit::ItemView::DownCast(scrollableHandle);
 
-    switch(gesture.state)
+    switch(gesture.GetState())
     {
-      case Gesture::Started:
+      case Dali::Gesture::Started:
       {
         if( !mPanProcessTimer )
         {
@@ -473,15 +473,14 @@ void ScrollBar::OnPan( const PanGesture& gesture )
 
         ShowIndicator();
         mScrollStart = scrollableHandle.GetCurrentProperty< float >( mPropertyScrollPosition );
-        mGestureDisplacement = Vector3::ZERO;
+        mGestureDisplacement = Vector2::ZERO;
         mIsPanning = true;
 
         break;
       }
-      case Gesture::Continuing:
+      case Dali::Gesture::Continuing:
       {
-        mGestureDisplacement.x += gesture.displacement.x;
-        mGestureDisplacement.y += gesture.displacement.y;
+        mGestureDisplacement += gesture.GetDisplacement();
 
         float minScrollPosition = scrollableHandle.GetCurrentProperty<float>( mPropertyMinScrollPosition );
         float maxScrollPosition = scrollableHandle.GetCurrentProperty<float>( mPropertyMaxScrollPosition );
@@ -529,7 +528,7 @@ void ScrollBar::OnPan( const PanGesture& gesture )
 
 void ScrollBar::OnSizeSet( const Vector3& size )
 {
-  if(mIndicatorHeightPolicy == Toolkit::ScrollBar::Fixed)
+  if(mIndicatorHeightPolicy == Toolkit::ScrollBar::FIXED)
   {
     mIndicator.SetProperty( Actor::Property::SIZE, Vector2( size.width, mIndicatorFixedHeight ) );
   }
@@ -565,7 +564,7 @@ void ScrollBar::SetIndicatorFixedHeight( float height )
 {
   mIndicatorFixedHeight = height;
 
-  if(mIndicatorHeightPolicy == Toolkit::ScrollBar::Fixed)
+  if(mIndicatorHeightPolicy == Toolkit::ScrollBar::FIXED)
   {
     mIndicator.SetProperty( Actor::Property::SIZE, Vector2( Self().GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).width, mIndicatorFixedHeight) );
   }
@@ -599,13 +598,13 @@ float ScrollBar::GetIndicatorHideDuration() const
 void ScrollBar::OnScrollDirectionPropertySet( Property::Value propertyValue )
 {
   std::string directionName( propertyValue.Get<std::string>() );
-  if(directionName == "Vertical")
+  if(directionName == "VERTICAL")
   {
-    SetScrollDirection(Toolkit::ScrollBar::Vertical);
+    SetScrollDirection(Toolkit::ScrollBar::VERTICAL);
   }
-  else if(directionName == "Horizontal")
+  else if(directionName == "HORIZONTAL")
   {
-    SetScrollDirection(Toolkit::ScrollBar::Horizontal);
+    SetScrollDirection(Toolkit::ScrollBar::HORIZONTAL);
   }
   else
   {
@@ -616,13 +615,13 @@ void ScrollBar::OnScrollDirectionPropertySet( Property::Value propertyValue )
 void ScrollBar::OnIndicatorHeightPolicyPropertySet( Property::Value propertyValue )
 {
   std::string policyName( propertyValue.Get<std::string>() );
-  if(policyName == "Variable")
+  if(policyName == "VARIABLE")
   {
-    SetIndicatorHeightPolicy(Toolkit::ScrollBar::Variable);
+    SetIndicatorHeightPolicy(Toolkit::ScrollBar::VARIABLE);
   }
-  else if(policyName == "Fixed")
+  else if(policyName == "FIXED")
   {
-    SetIndicatorHeightPolicy(Toolkit::ScrollBar::Fixed);
+    SetIndicatorHeightPolicy(Toolkit::ScrollBar::FIXED);
   }
   else
   {