Conversion to Apache 2.0 license

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

diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-impl.h b/base/dali-toolkit/internal/controls/text-view/text-view-impl.h
index 3f5579f..8d76347 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-view/text-view-impl.h
+++ b/base/dali-toolkit/internal/controls/text-view/text-view-impl.h
@@ -39,14 +39,14 @@ namespace Internal
 /**
  * TextView is a custom control for text aligning and multiline support
  */
-class TextView : public ControlImpl
+class TextView : public Control
 {
 public:
 
   // Properties
   enum
   {
-    TEXTVIEW_PROPERTY_START_INDEX = ControlImpl::CONTROL_PROPERTY_END_INDEX + 1,
+    TEXTVIEW_PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1,
     TEXTVIEW_PROPERTY_END_INDEX = TEXTVIEW_PROPERTY_START_INDEX + 1000 ///< Reserving 1000 property indices
   };
 
@@ -61,6 +61,7 @@ public:
     SplitOriginal,        ///< Split if it exceeds the width but no action if it exceeds the height.
     SplitFade,            ///< Split if it exceeds the width and faded if it exceeds the height.
     SplitShrink,          ///< Split if it exceeds the width and shrunk if it exceeds the height.
+    SplitEllipsizeEnd,    ///< Split if it exceeds the width and ellipsize if it exceeds the height.
     Fade,                 ///< Faded if it exceeds any boundary.
     FadeOriginal,         ///< Faded if it exceeds the width but no action if it exceeds the height.
     ShrinkOriginal,       ///< Shrunk if it exceeds the width but no action if it exceeds the height.
@@ -163,11 +164,6 @@ public:
   std::string GetText() const;
 
   /**
-   * @copydoc SetFont( const Font newFont )
-   */
-  void SetFont( const Font newFont );
-
-  /**
    * @copydoc SetLineHeightOffset()
    */
   void SetLineHeightOffset( PointSize offset );
@@ -360,7 +356,7 @@ public:
   static Property::Value GetProperty( BaseObject* object, Property::Index index );
 
 
-private: // From ControlImpl
+private: // From Control
 
   /**
    * @copydoc Toolkit::Control::OnInitialize()
@@ -368,9 +364,9 @@ private: // From ControlImpl
   virtual void OnInitialize();
 
   /**
-   * @copydoc Toolkit::Control::OnStyleChange()
+   * @copydoc Toolkit::Control::OnFontChange( )
    */
-  virtual void OnStyleChange( StyleChange change );
+  virtual void OnFontChange( bool defaultFontChange, bool defaultFontSizeChange );
 
   /**
    * @copydoc Toolkit::Control::OnControlSizeSet()
@@ -609,7 +605,7 @@ public:
                       Toolkit::TextView::LineJustification   lineJustification,
                       float                                  lineHeightOffset,
                       const std::string&                     ellipsizeText,
-                      const bool                             markUpEnabled );
+                      bool                                   markUpEnabled );
 
     /**
      * Copy constructor