X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-selection-toolbar-impl.cpp;h=cb1e205a8da9bd6704e4723a3d72eeb621ac1370;hp=3ff40b373a2a4661788aa38501ad7f1c11432e15;hb=refs%2Fchanges%2F64%2F41464%2F8;hpb=59bd8f6e76439d09a262c796ce27aa90236719db

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 3ff40b3..cb1e205 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
@@ -26,8 +26,6 @@
 #include <dali/public-api/math/vector2.h>
 #include <dali/public-api/math/vector4.h>
 #include <dali/devel-api/object/type-registry-helper.h>
-#include <iostream>
-#include <libintl.h>
 #include <cfloat>
 
 namespace Dali
@@ -120,6 +118,13 @@ void TextSelectionToolbar::OnInitialize()
   SetUp();
 }
 
+void TextSelectionToolbar::OnRelayout( const Vector2& size, RelayoutContainer& container )
+{
+  float width = std::max ( mTableOfButtons.GetNaturalSize().width, size.width );
+  mRulerX->SetDomain( RulerDomain( 0.0, width, true ) );
+  mScrollView.SetRulerX( mRulerX );
+}
+
 void TextSelectionToolbar::SetPopupMaxSize( const Size& maxSize )
 {
   mMaxSize = maxSize;
@@ -130,16 +135,35 @@ const Dali::Vector2& TextSelectionToolbar::GetPopupMaxSize() const
   return mMaxSize;
 }
 
+void TextSelectionToolbar::SetUpScrollView( Toolkit::ScrollView& scrollView )
+{
+  scrollView.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS );
+  scrollView.SetParentOrigin( ParentOrigin::CENTER_LEFT );
+  scrollView.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
+  scrollView.SetMaximumSize( mMaxSize );
+
+  scrollView.SetScrollingDirection( PanGestureDetector::DIRECTION_HORIZONTAL, Degree( 40.0f ) );
+  scrollView.SetAxisAutoLock( true );
+  scrollView.ScrollStartedSignal().Connect( this, &TextSelectionToolbar::OnScrollStarted );
+  scrollView.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 );
+}
+
 void TextSelectionToolbar::SetUp()
 {
   Actor self = Self();
   self.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS );
 
-  // Create Layer and Stencil.
-  mStencilLayer = Layer::New();
-  mStencilLayer.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS );
-  mStencilLayer.SetParentOrigin( ParentOrigin::CENTER );
-  mStencilLayer.SetMaximumSize( mMaxSize );
+  // Create Layer and Stencil.  Layer enable's clipping when content exceed maximum defined width.
+  Layer stencilLayer = Layer::New();
+  stencilLayer.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS );
+  stencilLayer.SetParentOrigin( ParentOrigin::CENTER );
+  stencilLayer.SetMaximumSize( mMaxSize );
 
   ImageActor stencil = CreateSolidColorActor( Color::RED );
   stencil.SetDrawMode( DrawMode::STENCIL );
@@ -147,21 +171,32 @@ void TextSelectionToolbar::SetUp()
   stencil.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
   stencil.SetParentOrigin( ParentOrigin::CENTER );
 
-  Actor scrollview = Actor::New(); //todo make a scrollview
-  scrollview.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::ALL_DIMENSIONS );
-  scrollview.SetParentOrigin( ParentOrigin::CENTER );
+  mScrollView  = Toolkit::ScrollView::New();
+  SetUpScrollView( mScrollView );
 
-  // Toolbar needs at least one option, adding further options with increase it's size
+  // Toolbar must start with at least one option, adding further options with increase it's size
   mTableOfButtons = Dali::Toolkit::TableView::New( 1, 1 );
   mTableOfButtons.SetFitHeight( 0 );
-  mTableOfButtons.SetParentOrigin( ParentOrigin::CENTER );
+  mTableOfButtons.SetParentOrigin( ParentOrigin::CENTER_LEFT );
+  mTableOfButtons.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
+
+
+  stencilLayer.Add( stencil );
+  stencilLayer.Add( mScrollView );
+  mScrollView.Add( mTableOfButtons );
+  self.Add( stencilLayer );
+
+  stencilLayer.RaiseToTop();
+}
 
-  mStencilLayer.Add( stencil );
-  mStencilLayer.Add( scrollview );
-  scrollview.Add( mTableOfButtons );
-  self.Add( mStencilLayer );
+void TextSelectionToolbar::OnScrollStarted( const Vector2& position )
+{
+  mTableOfButtons.SetSensitive( false );
+}
 
-  mStencilLayer.RaiseToTop();
+void TextSelectionToolbar::OnScrollCompleted( const Vector2& position )
+{
+  mTableOfButtons.SetSensitive( true );
 }
 
 void TextSelectionToolbar::AddOption( Actor& option )
@@ -197,6 +232,7 @@ TextSelectionToolbar::TextSelectionToolbar()
 
 TextSelectionToolbar::~TextSelectionToolbar()
 {
+  mRulerX.Reset();
 }