X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Ftext-font-style.h;h=e53d754139d6854faed36c85ce85b2fa32408792;hp=425131d18e1ccdb79b077a8d510a2a4f6dd8fd34;hb=528aa3699cd51dab5115bca1aaebb65d4bc67c15;hpb=aeef40d5dd70c7d878c7664986913ef2c6675a03

diff --git a/dali-toolkit/internal/text/text-font-style.h b/dali-toolkit/internal/text/text-font-style.h
index 425131d..e53d754 100644
--- a/dali-toolkit/internal/text/text-font-style.h
+++ b/dali-toolkit/internal/text/text-font-style.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_INTERNAL_TEXT_FONT_STYLE_H__
-#define __DALI_TOOLKIT_INTERNAL_TEXT_FONT_STYLE_H__
+#ifndef DALI_TOOLKIT_INTERNAL_TEXT_FONT_STYLE_H
+#define DALI_TOOLKIT_INTERNAL_TEXT_FONT_STYLE_H
 
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/text/text-controller.h>
-#include <dali-toolkit/internal/text/text-definitions.h>
 
 namespace Dali
 {
@@ -84,17 +83,26 @@ namespace FontStyle
 {
   enum Type
   {
-    DEFAULT, ///< The default font's style.
-    INPUT    ///< The input font's style.
+    DEFAULT,      ///< The default font's style.
+    INPUT,        ///< The input font's style.
+    PLACEHOLDER   ///< The placeholder text font's style.
   };
 };
 
 /**
+ * @brief Sets the font family property.
+ *
+ * @param[in] controller The text's controller.
+ * @param[in] value The value of the font's family.
+ */
+void SetFontFamilyProperty( ControllerPtr controller, const Property::Value& value );
+
+/**
  * @brief Sets the font's style property.
  *
  * @param[in] controller The text's controller.
  * @param[in] value The value of the font's style.
- * @param[in] type Whether the property is for the default font's style or the input font's style.
+ * @param[in] type Whether the property is for the default font's style, the input font's style or the placeholder font's style.
  *
  */
 void SetFontStyleProperty( ControllerPtr controller, const Property::Value& value, FontStyle::Type type );
@@ -104,7 +112,7 @@ void SetFontStyleProperty( ControllerPtr controller, const Property::Value& valu
  *
  * @param[in] controller The text's controller.
  * @param[out] value The value of the font's style.
- * @param[in] type Whether the property is for the default font's style or the input font's style.
+ * @param[in] type Whether the property is for the default font's style, the input font's style or the placeholder font's style.
  */
 void GetFontStyleProperty( ControllerPtr controller, Property::Value& value, FontStyle::Type type );
 
@@ -140,4 +148,4 @@ FontSlant StringToSlant( const char* const slantStr );
 
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_INTERNAL_TEXT_FONT_STYLE_H__
+#endif // DALI_TOOLKIT_INTERNAL_TEXT_FONT_STYLE_H