Bitmap Font support for TextLabel.

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / text / bitmap-font.h

diff --git a/dali-toolkit/devel-api/text/bitmap-font.h b/dali-toolkit/devel-api/text/bitmap-font.h
index ca068b4..0d463df 100755 (executable)
--- a/dali-toolkit/devel-api/text/bitmap-font.h
+++ b/dali-toolkit/devel-api/text/bitmap-font.h
@@ -52,14 +52,26 @@ struct DALI_TOOLKIT_API Glyph
   Glyph();
 
   /**
+   * @brief Constructor.
+   *
+   * Initialize the members with the given values.
+   *
+   * @param[in] url The url of the bitmap for that glyph.
+   * @param[in] utf8 The utf8 codification of the glyph.
+   * @param[in] ascender The ascender of the glyph.
+   * @param[in] descender The descender of the glyph.
+   */
+  Glyph( const std::string& url, const std::string utf8, float ascender, float descender );
+
+  /**
    * @brief Default destructor.
    */
   ~Glyph();
 
-  std::string url;  ///< The url of the glyph.
-  std::string utf8; ///< the glyph encoded in utf8
-  float ascender;   ///< The ascender. The distance from the base line to the top of the glyph.
-  float descender;  ///< The descender. The distance from the base line to the bottom of the glyph.
+  std::string url; ///< The url of the glyph.
+  uint8_t utf8[4]; ///< the glyph encoded in utf8
+  float ascender;  ///< The ascender. The distance from the base line to the top of the glyph.
+  float descender; ///< The descender. The distance from the base line to the bottom of the glyph.
 };
 
 /**
@@ -83,6 +95,7 @@ struct DALI_TOOLKIT_API BitmapFontDescription
   std::string name;          ///< Name of the font.
   float underlinePosition;   ///< The position of the underline from the base line.
   float underlineThickness;  ///< The thickness of the underline.
+  bool isColorFont:1;        ///< Whether the glyphs of this font have their own colors.
 };
 
 /**