Merge "Add Text's popup overshoot property." into devel/master
authorPaul Wisbey <p.wisbey@samsung.com>
Fri, 18 Sep 2015 09:07:06 +0000 (02:07 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Fri, 18 Sep 2015 09:07:07 +0000 (02:07 -0700)
dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.cpp
dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.h

index 7a32889..e26614d 100644 (file)
@@ -176,22 +176,24 @@ const Dali::Vector2& TextSelectionToolbar::GetPopupMaxSize() const
   return mMaxSize;
 }
 
-void TextSelectionToolbar::SetUpScrollView( Toolkit::ScrollView& scrollView )
+void TextSelectionToolbar::SetUpScrollView()
 {
-  scrollView.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS );
-  scrollView.SetParentOrigin( ParentOrigin::CENTER_LEFT );
-  scrollView.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
+  mScrollView.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS );
+  mScrollView.SetParentOrigin( ParentOrigin::CENTER_LEFT );
+  mScrollView.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
 
-  scrollView.SetScrollingDirection( PanGestureDetector::DIRECTION_HORIZONTAL, Degree( 40.0f ) );
-  scrollView.SetAxisAutoLock( true );
-  scrollView.ScrollStartedSignal().Connect( this, &TextSelectionToolbar::OnScrollStarted );
-  scrollView.ScrollCompletedSignal().Connect( this, &TextSelectionToolbar::OnScrollCompleted );
+  mScrollView.SetScrollingDirection( PanGestureDetector::DIRECTION_HORIZONTAL, Degree( 40.0f ) );
+  mScrollView.SetAxisAutoLock( true );
+  mScrollView.ScrollStartedSignal().Connect( this, &TextSelectionToolbar::OnScrollStarted );
+  mScrollView.ScrollCompletedSignal().Connect( this, &TextSelectionToolbar::OnScrollCompleted );
 
   mRulerX = new DefaultRuler();  // IntrusivePtr which is unreferenced when ScrollView is destroyed.
 
   RulerPtr rulerY = new DefaultRuler();  // IntrusivePtr which is unreferenced when ScrollView is destroyed.
   rulerY->Disable();
-  scrollView.SetRulerY( rulerY );
+  mScrollView.SetRulerY( rulerY );
+
+  mScrollView.SetOvershootEnabled( true );
 }
 
 void TextSelectionToolbar::SetUp()
@@ -211,7 +213,7 @@ void TextSelectionToolbar::SetUp()
   stencil.SetParentOrigin( ParentOrigin::CENTER );
 
   mScrollView  = Toolkit::ScrollView::New();
-  SetUpScrollView( mScrollView );
+  SetUpScrollView();
 
   // Toolbar must start with at least one option, adding further options with increase it's size
   mTableOfButtons = Dali::Toolkit::TableView::New( 1, 1 );
index 7309781..29d25db 100644 (file)
@@ -120,9 +120,8 @@ private: // From Control
 
   /**
    * @brief Set up scrollview to scroll Toolbar horizontally
-   * @param[out] scrollView scrollview to setup
    */
-  void SetUpScrollView( Toolkit::ScrollView& scrollView );
+  void SetUpScrollView();
 
   /**
    * @brief Set up the parts that make the Toolbar