Merge "Usage of CustomeView for ScrollContainer and code refactoring accordingly...

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / visuals / text / text-visual.h

diff --git a/dali-toolkit/internal/visuals/text/text-visual.h b/dali-toolkit/internal/visuals/text/text-visual.h
index 47289d1..b345c76 100644 (file)
--- a/dali-toolkit/internal/visuals/text/text-visual.h
+++ b/dali-toolkit/internal/visuals/text/text-visual.h
@@ -26,7 +26,6 @@
 #include <dali-toolkit/internal/visuals/visual-base-impl.h>
 #include <dali-toolkit/internal/text/rendering/text-renderer.h>
 #include <dali-toolkit/internal/text/text-controller.h>
-#include <dali-toolkit/internal/text/text-scroller.h>
 
 namespace Dali
 {
@@ -80,28 +79,17 @@ public:
    */
   static TextVisualPtr New( VisualFactoryCache& factoryCache );
 
-  /**
-   * @brief Sets the text control interface which is needed to communicate with a control.
-   * @param[in] controlInterface Pointer to the control-interface.
-   */
-  void SetTextControlInterface( Text::ControlInterface* controlInterface );
-
 public: // from Visual::Base
 
   /**
    * @copydoc Visual::Base::GetHeightForWidth()
    */
-  float GetHeightForWidth( float width ) const;
-
-  /**
-   * @copydoc Visual::Base::GetNaturalSize()
-   */
-  virtual void SetSize( const Vector2& size );
+  virtual float GetHeightForWidth( float width ) const;
 
   /**
    * @copydoc Visual::Base::GetNaturalSize()
    */
-  virtual void GetNaturalSize( Vector2& naturalSize ) const;
+  virtual void GetNaturalSize( Vector2& naturalSize );
 
   /**
    * @copydoc Visual::Base::CreatePropertyMap()
@@ -149,6 +137,11 @@ protected:
    */
   virtual Dali::Property::Value DoGetProperty( Dali::Property::Index index );
 
+  /**
+   * @copydoc Visual::Base::OnSetTransform
+   */
+  virtual void OnSetTransform();
+
 private:
 
   /**
@@ -157,22 +150,11 @@ private:
    */
   void RenderText();
 
-  /**
-   * @brief Stops the text auto scroll.
-   */
-  void StopTextAutoScrolling();
-
-  /**
-   * @brief Set up Autoscrolling.
-   */
-  void SetUpAutoScrolling();
-
 private:
   Text::ControllerPtr          mController;               ///< The text's controller.
   WeakHandle<Actor>            mSelf;
 
   Text::RendererPtr            mRenderer;
-  Text::TextScrollerPtr        mTextScroller;
   Actor                        mRenderableActor;
 
   int mRenderingBackend;