From cd6ae55283181f92ff32ec138e71b3200ca5b221 Mon Sep 17 00:00:00 2001 From: "v.cebollada" Date: Thu, 27 Aug 2015 10:29:44 +0900 Subject: [PATCH] TextSelectionToolbar cleaning. Change-Id: I1b5600e4696adb2e68fa6c0d480110e39de9bc91 Signed-off-by: v.cebollada --- .../text-controls/text-selection-toolbar-impl.cpp | 22 ++++++++++++---------- .../text-controls/text-selection-toolbar-impl.h | 3 +-- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.cpp index eb6efe4..1fd2160 100644 --- a/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.cpp @@ -166,22 +166,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() @@ -201,7 +203,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 ); diff --git a/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.h b/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.h index 7309781..29d25db 100644 --- a/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.h +++ b/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.h @@ -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 -- 2.7.4