Removed a float equality comparision

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / controls / text-controls / text-label.h

diff --git a/dali-toolkit/public-api/controls/text-controls/text-label.h b/dali-toolkit/public-api/controls/text-controls/text-label.h
index ba755da..7ecb200 100644 (file)
--- a/dali-toolkit/public-api/controls/text-controls/text-label.h
+++ b/dali-toolkit/public-api/controls/text-controls/text-label.h
@@ -64,19 +64,31 @@ public:
       POINT_SIZE,                               ///< name "point-size",           The size of font in points,                   type FLOAT
       MULTI_LINE,                               ///< name "multi-line",           The single-line or multi-line layout option,  type BOOLEAN
       HORIZONTAL_ALIGNMENT,                     ///< name "horizontal-alignment", The line horizontal alignment,                type STRING,  values "BEGIN", "CENTER", "END"
-      VERTICAL_ALIGNMENT,                        ///< name "vertical-alignment",   The line vertical alignment,                  type STRING,  values   "TOP",   "CENTER",   "BOTTOM"
+      VERTICAL_ALIGNMENT,                       ///< name "vertical-alignment",   The line vertical alignment,                  type STRING,  values   "TOP",   "CENTER",   "BOTTOM"
+      TEXT_COLOR,                               ///< name "text-color",           The text color,                               type VECTOR4
       SHADOW_OFFSET,                            ///< name "shadow-offset",        The drop shadow offset 0 indicates no shadow, type VECTOR2
-      SHADOW_COLOR,                             ///< name "shadow-color",         The color of a drop shadow                  , type VECTOR4
+      SHADOW_COLOR,                             ///< name "shadow-color",         The color of a drop shadow,                   type VECTOR4
+      UNDERLINE_ENABLED,                        ///< name "underline-enabled",    The underline enabled flag                    type BOOLEAN
+      UNDERLINE_COLOR,                          ///< name "underline-color",      The color of the underline                    type VECTOR4
     };
   };
 
   /**
-   * Create the TextLabel control.
+   * @brief Create the TextLabel control.
+   *
    * @return A handle to the TextLabel control.
    */
   static TextLabel New();
 
   /**
+   * @brief Create the TextLabel control.
+   *
+   * @param[in] text The text to display.
+   * @return A handle to the TextLabel control.
+   */
+  static TextLabel New( const std::string& text );
+
+  /**
    * @brief Creates an empty handle.
    */
   TextLabel();