X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-label-impl.h;h=ae88beb1a00759ad1bbd7bf442e72f8a59bb8643;hb=5b3cf0e6742934674bdf62bbe15af00e39eae566;hp=3ea01f20c24b70fec1e84f581f3d39cae4828f54;hpb=306d2f61a1b64179e801fa8a0bb2bd7b4e9dd682;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

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 3ea01f2..ae88beb 100644
--- a/dali-toolkit/internal/controls/text-controls/text-label-impl.h
+++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.h
@@ -21,7 +21,8 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/text-controls/text-label.h>
-#include <dali-toolkit/public-api/text/text-controller.h>
+#include <dali-toolkit/internal/text/text-controller.h>
+#include <dali-toolkit/internal/text/rendering/text-renderer.h>
 
 namespace Dali
 {
@@ -35,31 +36,20 @@ namespace Internal
 /**
  * @brief A control which renders a short text string.
  */
-class TextLabel : public Control
+class TextLabel : public Control, public Text::ControlInterface
 {
 public:
 
-  // Properties
-  enum
-  {
-    TEXTLABEL_PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1,
-    TEXTLABEL_PROPERTY_END_INDEX = TEXTLABEL_PROPERTY_START_INDEX + 1000 ///< Reserving 1000 property indices
-  };
-
   /**
    * @copydoc Dali::Toollkit::TextLabel::New()
    */
   static Toolkit::TextLabel New();
 
-  /**
-   * @copydoc Dali::Toollkit::TextLabel::SetRenderer()
-   */
-  void SetRenderer( Text::RendererPtr renderer );
-
   // Properties
 
   /**
-   * Called when a property of an object of this type is set.
+   * @brief Called when a property of an object of this type is set.
+   *
    * @param[in] object The object whose property is set.
    * @param[in] index The property index.
    * @param[in] value The new property value.
@@ -67,7 +57,8 @@ public:
   static void SetProperty( BaseObject* object, Property::Index index, const Property::Value& value );
 
   /**
-   * Called to retrieve a property of an object of this type.
+   * @brief Called to retrieve a property of an object of this type.
+   *
    * @param[in] object The object whose property is to be retrieved.
    * @param[in] index The property index.
    * @return The current value of the property.
@@ -82,23 +73,51 @@ private: // From Control
   virtual void OnInitialize();
 
   /**
-   * @copydoc Control::OnInitialize()
+   * @copydoc Control::OnStyleChange()
    */
-  virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );
+  virtual void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change );
 
-private: // Implementation
+  /**
+   * @copydoc Control::OnRelayout()
+   */
+  virtual void OnRelayout( const Vector2& size, RelayoutContainer& container );
+
+  /**
+   * @copydoc Control::GetNaturalSize()
+   */
+  virtual Vector3 GetNaturalSize();
+
+  /**
+   * @copydoc Control::GetHeightForWidth()
+   */
+  virtual float GetHeightForWidth( float width );
 
   /**
-   * Helper for SetProperty.
-   * @param[in] text The new "text" property value.
+   * @copydoc Text::ControlInterface::AddDecoration()
    */
-  void SetText( const std::string& text );
+  virtual void AddDecoration( Actor& actor, bool needsClipping );
 
   /**
-   * Helper for SetProperty.
-   * @param[in] multiLine The new "multi-line" property value.
+   * @copydoc Control::OnStageConnection()
    */
-  void SetMultiLine( bool multiLine );
+  virtual void OnStageConnection( int depth );
+
+  /**
+   * @copydoc Text::ControlInterface::RequestTextRelayout()
+   */
+  virtual void RequestTextRelayout();
+
+  /**
+   * @copydoc Text::ControlInterface::TextChanged()
+   */
+  virtual void TextChanged();
+
+  /**
+   * @copydoc Text::ControlInterface::MaxLengthReached()
+   */
+  virtual void MaxLengthReached();
+
+private: // Implementation
 
   /**
    * Construct a new TextLabel.
@@ -116,10 +135,21 @@ 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();
+
 private: // Data
 
   Text::ControllerPtr mController;
   Text::RendererPtr mRenderer;
+  Actor mRenderableActor;
+  int mRenderingBackend;
+  bool mHasBeenStaged:1;
 };
 
 } // namespace Internal