Update interface to sync with dali-core change.

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / text-controls / text-label-impl.h

diff --git a/dali-toolkit/internal/controls/text-controls/text-label-impl.h b/dali-toolkit/internal/controls/text-controls/text-label-impl.h
index f15acbf..17bf6e5 100644 (file)
--- a/dali-toolkit/internal/controls/text-controls/text-label-impl.h
+++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.h
@@ -18,6 +18,9 @@
  *
  */
 
+// EXTERNAL INCLUDES
+#include <dali/public-api/object/property-map.h>
+
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/text-controls/text-label.h>
@@ -26,6 +29,8 @@
 #include <dali-toolkit/internal/text/text-scroller-interface.h>
 #include <dali-toolkit/internal/text/rendering/text-renderer.h>
 #include <dali-toolkit/internal/text/text-scroller.h>
+#include <dali-toolkit/internal/visuals/text/text-visual.h>
+
 
 namespace Dali
 {
@@ -98,7 +103,7 @@ private: // From Control
   /**
    * @copydoc Control::OnPropertySet()
    */
-  virtual void OnPropertySet( Property::Index index, Property::Value propertyValue ) override ;
+  void OnPropertySet( Property::Index index, const Property::Value& propertyValue ) override ;
 
   // From ControlInterface
 
@@ -132,14 +137,6 @@ private:
   TextLabel(const TextLabel&);
   TextLabel& operator=(const TextLabel& rhs);
 
-  // Connection needed to re-render text, when a Text Label returns to the stage
-  void OnStageConnect( Dali::Actor actor );
-
-  /**
-   * @brief Render view, create and attach actor(s) to this Text Label
-   */
-  void RenderText();
-
   /**
    * @brief Set up Autoscrolling
    */
@@ -148,11 +145,12 @@ private:
 private: // Data
 
   Text::ControllerPtr mController;
-  Text::RendererPtr mRenderer;
   Text::TextScrollerPtr mTextScroller;
-  Actor mRenderableActor;
+
+  Toolkit::Visual::Base mVisual;
+
   int mRenderingBackend;
-  bool mHasBeenStaged:1;
+  bool mTextUpdateNeeded:1;
 };
 
 } // namespace Internal